<feed xmlns='http://www.w3.org/2005/Atom'>
<title>linux-dev/arch/m68knommu/kernel/vmlinux.lds.S, branch master</title>
<subtitle>Linux kernel development work - see feature branches</subtitle>
<id>https://git.zx2c4.com/linux-dev/atom/arch/m68knommu/kernel/vmlinux.lds.S?h=master</id>
<link rel='self' href='https://git.zx2c4.com/linux-dev/atom/arch/m68knommu/kernel/vmlinux.lds.S?h=master'/>
<link rel='alternate' type='text/html' href='https://git.zx2c4.com/linux-dev/'/>
<updated>2011-03-25T04:05:13Z</updated>
<entry>
<title>m68k: merge m68k and m68knommu arch directories</title>
<updated>2011-03-25T04:05:13Z</updated>
<author>
<name>Greg Ungerer</name>
<email>gerg@uclinux.org</email>
</author>
<published>2011-03-22T03:39:27Z</published>
<link rel='alternate' type='text/html' href='https://git.zx2c4.com/linux-dev/commit/?id=66d857b08b8c3ed5c72c361f863cce77d2a978d7'/>
<id>urn:sha1:66d857b08b8c3ed5c72c361f863cce77d2a978d7</id>
<content type='text'>
There is a lot of common code that could be shared between the m68k
and m68knommu arch branches. It makes sense to merge the two branches
into a single directory structure so that we can more easily share
that common code.

This is a brute force merge, based on a script from Stephen King
&lt;sfking@fdwdc.com&gt;, which was originally written by Arnd Bergmann
&lt;arnd@arndb.de&gt;.

&gt; The script was inspired by the script Sam Ravnborg used to merge the
&gt; includes from m68knommu. For those files common to both arches but
&gt; differing in content, the m68k version of the file is renamed to
&gt; &lt;file&gt;_mm.&lt;ext&gt; and the m68knommu version of the file is moved into the
&gt; corresponding m68k directory and renamed &lt;file&gt;_no.&lt;ext&gt; and a small
&gt; wrapper file &lt;file&gt;.&lt;ext&gt; is used to select between the two version. Files
&gt; that are common to both but don't differ are removed from the m68knommu
&gt; tree and files and directories that are unique to the m68knommu tree are
&gt; moved to the m68k tree. Finally, the arch/m68knommu tree is removed.
&gt;
&gt; To select between the the versions of the files, the wrapper uses
&gt;
&gt; #ifdef CONFIG_MMU
&gt; #include &lt;file&gt;_mm.&lt;ext&gt;
&gt; #else
&gt; #include &lt;file&gt;_no.&lt;ext&gt;
&gt; #endif

On top of this file merge I have done a simplistic merge of m68k and
m68knommu Kconfig, which primarily attempts to keep existing options and
menus in place. Other than a handful of options being moved it produces
identical .config outputs on m68k and m68knommu targets I tested it on.

With this in place there is now quite a bit of scope for merge cleanups
in future patches.

Signed-off-by: Greg Ungerer &lt;gerg@uclinux.org&gt;
</content>
</entry>
<entry>
<title>m68knommu: add missing linker __modver section</title>
<updated>2011-02-15T23:43:17Z</updated>
<author>
<name>Greg Ungerer</name>
<email>gerg@uclinux.org</email>
</author>
<published>2011-02-08T04:45:59Z</published>
<link rel='alternate' type='text/html' href='https://git.zx2c4.com/linux-dev/commit/?id=81174262e2e653e15c7ef23efa5f88fe31e91e2a'/>
<id>urn:sha1:81174262e2e653e15c7ef23efa5f88fe31e91e2a</id>
<content type='text'>
Add missing linker section __modver to fix:

  LD      vmlinux
/usr/local/bin/../m68k-uclinux/bin/ld.real: error: no memory region specified for loadable section `__modver'

Signed-off-by: Greg Ungerer &lt;gerg@uclinux.org&gt;
</content>
</entry>
<entry>
<title>m68knommu: fix missing linker segments</title>
<updated>2010-09-07T20:55:30Z</updated>
<author>
<name>Greg Ungerer</name>
<email>gerg@snapgear.com</email>
</author>
<published>2010-09-03T01:15:19Z</published>
<link rel='alternate' type='text/html' href='https://git.zx2c4.com/linux-dev/commit/?id=e6ba59bcae6968ee18ef5a237a8020a0ea331ae1'/>
<id>urn:sha1:e6ba59bcae6968ee18ef5a237a8020a0ea331ae1</id>
<content type='text'>
Recent changes to linker segments that hold per-cpu data broke linking
for m68knommu targets:

  LD      vmlinux
/usr/local/bin/m68k-uclinux-ld.real: error: no memory region specified for loadable section `.data..shared_aligned'

Add missing segments into the m68knommu linker script.

Signed-off-by: Greg Ungerer &lt;gerg@uclinux.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
</content>
</entry>
<entry>
<title>Rename .data.initvect to .data..initvect.</title>
<updated>2010-03-03T10:26:01Z</updated>
<author>
<name>Denys Vlasenko</name>
<email>vda.linux@googlemail.com</email>
</author>
<published>2010-02-20T00:03:54Z</published>
<link rel='alternate' type='text/html' href='https://git.zx2c4.com/linux-dev/commit/?id=2c31c341a827b99eef743753aa9adb917b9ea6db'/>
<id>urn:sha1:2c31c341a827b99eef743753aa9adb917b9ea6db</id>
<content type='text'>
Signed-off-by: Denys Vlasenko &lt;vda.linux@googlemail.com&gt;
Signed-off-by: Michal Marek &lt;mmarek@suse.cz&gt;
</content>
</entry>
<entry>
<title>Rename .text.lock to .text..lock.</title>
<updated>2010-03-03T10:26:00Z</updated>
<author>
<name>Denys Vlasenko</name>
<email>vda.linux@googlemail.com</email>
</author>
<published>2010-02-20T00:03:48Z</published>
<link rel='alternate' type='text/html' href='https://git.zx2c4.com/linux-dev/commit/?id=75ddb0e87d0d31ad44d574e7fe2e962e4efecadb'/>
<id>urn:sha1:75ddb0e87d0d31ad44d574e7fe2e962e4efecadb</id>
<content type='text'>
Signed-off-by: Denys Vlasenko &lt;vda.linux@googlemail.com&gt;
Signed-off-by: Michal Marek &lt;mmarek@suse.cz&gt;
</content>
</entry>
<entry>
<title>m68knommu: Split the .init section into INIT_TEXT_SECTION and INIT_DATA_SECTION.</title>
<updated>2009-12-04T01:45:32Z</updated>
<author>
<name>Tim Abbott</name>
<email>tabbott@ksplice.com</email>
</author>
<published>2009-10-18T17:23:55Z</published>
<link rel='alternate' type='text/html' href='https://git.zx2c4.com/linux-dev/commit/?id=53749f735a5b79156b56e75ee379be9e299b5e4b'/>
<id>urn:sha1:53749f735a5b79156b56e75ee379be9e299b5e4b</id>
<content type='text'>
Signed-off-by: Tim Abbott &lt;tabbott@ksplice.com&gt;
Signed-off-by: Greg Ungerer &lt;gerg@uclinux.org&gt;
</content>
</entry>
<entry>
<title>m68knommu: Move __init_end out of the .init section.</title>
<updated>2009-12-04T01:45:32Z</updated>
<author>
<name>Tim Abbott</name>
<email>tabbott@ksplice.com</email>
</author>
<published>2009-10-18T17:23:54Z</published>
<link rel='alternate' type='text/html' href='https://git.zx2c4.com/linux-dev/commit/?id=995bcd3dc1924095ddda45d0f8ece6bf6124d74e'/>
<id>urn:sha1:995bcd3dc1924095ddda45d0f8ece6bf6124d74e</id>
<content type='text'>
Signed-off-by: Tim Abbott &lt;tabbott@ksplice.com&gt;
Signed-off-by: Greg Ungerer &lt;gerg@uclinux.org&gt;
</content>
</entry>
<entry>
<title>m68knommu: Move __init_begin out of the .init section.</title>
<updated>2009-12-04T01:45:32Z</updated>
<author>
<name>Tim Abbott</name>
<email>tabbott@ksplice.com</email>
</author>
<published>2009-10-18T17:23:53Z</published>
<link rel='alternate' type='text/html' href='https://git.zx2c4.com/linux-dev/commit/?id=a90a44ee901a1892473864d1a6c267dd04f2c96d'/>
<id>urn:sha1:a90a44ee901a1892473864d1a6c267dd04f2c96d</id>
<content type='text'>
Signed-off-by: Tim Abbott &lt;tabbott@ksplice.com&gt;
Signed-off-by: Greg Ungerer &lt;gerg@uclinux.org&gt;
</content>
</entry>
<entry>
<title>m68knommu: Use more macros inside the .init section.</title>
<updated>2009-12-04T01:45:31Z</updated>
<author>
<name>Tim Abbott</name>
<email>tabbott@ksplice.com</email>
</author>
<published>2009-10-18T17:23:52Z</published>
<link rel='alternate' type='text/html' href='https://git.zx2c4.com/linux-dev/commit/?id=84bd75715509c862eb9f536c4181dfa2b6d408dc'/>
<id>urn:sha1:84bd75715509c862eb9f536c4181dfa2b6d408dc</id>
<content type='text'>
Signed-off-by: Tim Abbott &lt;tabbott@ksplice.com&gt;
Signed-off-by: Greg Ungerer &lt;gerg@uclinux.org&gt;
</content>
</entry>
<entry>
<title>m68knommu: Use INIT_TASK_DATA and CACHELINE_ALIGNED_DATA.</title>
<updated>2009-12-04T01:45:31Z</updated>
<author>
<name>Tim Abbott</name>
<email>tabbott@ksplice.com</email>
</author>
<published>2009-10-18T17:23:51Z</published>
<link rel='alternate' type='text/html' href='https://git.zx2c4.com/linux-dev/commit/?id=49612a5fa574227db9eb14b0dd4befcf4e273a73'/>
<id>urn:sha1:49612a5fa574227db9eb14b0dd4befcf4e273a73</id>
<content type='text'>
Signed-off-by: Tim Abbott &lt;tabbott@ksplice.com&gt;
Signed-off-by: Greg Ungerer &lt;gerg@uclinux.org&gt;
</content>
</entry>
</feed>
