Merge headerfiles for m68k and m68knommu to arch/m68k/include/asm

With the above construct we do the "right thing" also for headers exported to userspace.
But actually none of the headers using the above are subject for export at the moment so we could use a CONFIG_ symbol for the same.

Following is a pseudo patch (a script + a patch) that merges the include files for m68k and m68knommu in one place at:

arch/m68k/include/asm

The script was written by Arnd and I added a few modifications.

I have used the following include guard:

#ifdef __uClinux__
#include "atomic_no.h"
#else
#include "atomic_mm.h"
#endif

gcc -E -dM for the two compilers revealed that this was the only symbol that differed.

With the above construct we do the "right thing" also for headers exported to userspace.
But actually none of the headers using the above are subject for export at the moment so we could use a CONFIG_ symbol for the same.

Quoted 10 lines

I have used the following include guard:

#ifdef __uClinux__
#include "atomic_no.h"
#else
#include "atomic_mm.h"
#endif

gcc -E -dM for the two compilers revealed that this was the only symbol that differed.

I think you can share a toolchain for m68k and m68knommu, at least for the kernel (I used my plain m68k toolchain when experimenting with m68knommu for Amiga).

Quoted 5 lines

With the above construct we do the "right thing" also for headers exported to userspace.
But actually none of the headers using the above are subject for export at the moment so we could use a CONFIG_ symbol for the same.

So I prefer to just check CONFIG_MMU.

Quoted 21 lines · Geert Uytterhoeven

Quoted 10 lines

I have used the following include guard:

#ifdef __uClinux__
#include "atomic_no.h"
#else
#include "atomic_mm.h"
#endif

gcc -E -dM for the two compilers revealed that this was the only symbol that differed.

I think you can share a toolchain for m68k and m68knommu, at least for the kernel (I used my plain m68k toolchain when experimenting with m68knommu for Amiga).

Quoted 5 lines

With the above construct we do the "right thing" also for headers exported to userspace.
But actually none of the headers using the above are subject for export at the moment so we could use a CONFIG_ symbol for the same.

Quoted 1 line

So I prefer to just check CONFIG_MMU.

Some of them are, by means of include/asm-generic/Kbuild.asm, e.g. unistd.h!

I'm not sure if it's entirely correct, but I think you can use

#ifdef __KERNEL__

# ifdef CONFIG_MMU
#  include "atomic_mm.h
# else
#  include "atomic_no.h
# endif
#else
# ifndef __uClinux__
#  include "atomic_mm.h
# else
#  include "atomic_no.h
# endif
#endif

Quoted 22 lines · Arnd Bergmann

Quoted 21 lines · Geert Uytterhoeven

Quoted 10 lines

I have used the following include guard:

#ifdef __uClinux__
#include "atomic_no.h"
#else
#include "atomic_mm.h"
#endif

gcc -E -dM for the two compilers revealed that this was the only symbol that differed.

I think you can share a toolchain for m68k and m68knommu, at least for the kernel (I used my plain m68k toolchain when experimenting with m68knommu for Amiga).

Quoted 5 lines

With the above construct we do the "right thing" also for headers exported to userspace.
But actually none of the headers using the above are subject for export at the moment so we could use a CONFIG_ symbol for the same.

Quoted 4 lines

Quoted 1 line

So I prefer to just check CONFIG_MMU.

Some of them are, by means of include/asm-generic/Kbuild.asm, e.g. unistd.h!

I was fooled by make headers_check showing no errros. But it turns out that headers_check does not recognize includes made with "".

So I will update the patch to include revevant *_{no,mm}.h files in Kbuild.

Quoted 4 lines

I'm not sure if it's entirely correct, but I think you can use

#ifdef __KERNEL__

Quoted 12 lines

# ifdef CONFIG_MMU
#  include "atomic_mm.h
# else
#  include "atomic_no.h
# endif
#else
# ifndef __uClinux__
#  include "atomic_mm.h
# else
#  include "atomic_no.h
# endif
#endif

Can someone with a shared (m68k/m68knommu) please check if __uClinux__ is only set in the m68knommu case.

Use:

touch foo.h; gcc -E -dM

to see what is defined by the compiler.
You will also need to specify if this is for m68k or m68knommu.

Ah, it's the restart_syscall:

m68knommu/include/asm/unistd.h renamed from asm-m68k/unistd.h +1 -3

@@ -5,6 +5,7 @@
  * This file contains the system call numbers.
  */
 
+#define __NR_restart_syscall      0
 #define __NR_exit		  1
 #define __NR_fork		  2
 #define __NR_read		  3

@@ -359,9 +360,6 @@
 #define __ARCH_WANT_SYS_SIGPROCMASK
 #define __ARCH_WANT_SYS_RT_SIGACTION
 
-/* whitelist for checksyscalls */
-#define __IGNORE_restart_syscall
-
 /*
  * "Conditional" syscalls
  *

Sorry, I don't know about syscall restart handling, and why it differs. Anyone who can enlighten me?

What are the other exported headers that differ?

Quoted 1 line · Geert Uytterhoeven

What are the other exported headers that differ?

byteorder.h, param.h, ptrace.h, setup.h, sigcontext.h, siginfo.h, signal.h and unistd.h.

Quoted 22 lines · Arnd Bergmann

Quoted 21 lines · Geert Uytterhoeven

Quoted 10 lines

I have used the following include guard:

#ifdef __uClinux__
#include "atomic_no.h"
#else
#include "atomic_mm.h"
#endif

gcc -E -dM for the two compilers revealed that this was the only symbol that differed.

I think you can share a toolchain for m68k and m68knommu, at least for the kernel (I used my plain m68k toolchain when experimenting with m68knommu for Amiga).

Quoted 5 lines

With the above construct we do the "right thing" also for headers exported to userspace.
But actually none of the headers using the above are subject for export at the moment so we could use a CONFIG_ symbol for the same.

Quoted 4 lines

Quoted 1 line

So I prefer to just check CONFIG_MMU.

Some of them are, by means of include/asm-generic/Kbuild.asm, e.g. unistd.h!

I was fooled by make headers_check showing no errros. But it turns out that headers_check does not recognize includes made with "".

So I will update the patch to include revevant *_{no,mm}.h files in Kbuild.

Quoted 4 lines

I'm not sure if it's entirely correct, but I think you can use

#ifdef __KERNEL__

Quoted 12 lines

# ifdef CONFIG_MMU
#  include "atomic_mm.h
# else
#  include "atomic_no.h
# endif
#else
# ifndef __uClinux__
#  include "atomic_mm.h
# else
#  include "atomic_no.h
# endif
#endif

Can someone with a shared (m68k/m68knommu) please check if __uClinux__ is only set in the m68knommu case.

Use:

touch foo.h; gcc -E -dM

to see what is defined by the compiler.
You will also need to specify if this is for m68k or m68knommu.

None of my m68k-linux compilers set __uClinux__, as expected.

Quoted 1 line · Geert Uytterhoeven

None of my m68k-linux compilers set __uClinux__, as expected.

IIUC, userspace ABI is supposed to be completely identical.

Quoted 55 lines · Sam Ravnborg

Quoted 22 lines · Arnd Bergmann

Quoted 21 lines · Geert Uytterhoeven

Quoted 10 lines

I have used the following include guard:

#ifdef __uClinux__
#include "atomic_no.h"
#else
#include "atomic_mm.h"
#endif

gcc -E -dM for the two compilers revealed that this was the only symbol that differed.

I think you can share a toolchain for m68k and m68knommu, at least for the kernel (I used my plain m68k toolchain when experimenting with m68knommu for Amiga).

Quoted 5 lines

With the above construct we do the "right thing" also for headers exported to userspace.
But actually none of the headers using the above are subject for export at the moment so we could use a CONFIG_ symbol for the same.

Quoted 4 lines

Quoted 1 line

So I prefer to just check CONFIG_MMU.

Some of them are, by means of include/asm-generic/Kbuild.asm, e.g. unistd.h!

I was fooled by make headers_check showing no errros. But it turns out that headers_check does not recognize includes made with "".

So I will update the patch to include revevant *_{no,mm}.h files in Kbuild.

Quoted 15 lines

I'm not sure if it's entirely correct, but I think you can use

#ifdef __KERNEL__

# ifdef CONFIG_MMU
#  include "atomic_mm.h
# else
#  include "atomic_no.h
# endif
#else
# ifndef __uClinux__
#  include "atomic_mm.h
# else
#  include "atomic_no.h
# endif
#endif

Can someone with a shared (m68k/m68knommu) please check if __uClinux__ is only set in the m68knommu case.

Use:

Quoted 4 lines

touch foo.h; gcc -E -dM

to see what is defined by the compiler.
You will also need to specify if this is for m68k or m68knommu.

Any comments from the m68knommu toolchain people?

None of my m68k-linux compilers set __uClinux__, as expected.

Quoted 2 lines

None of my m68k-linux compilers set __uClinux__, as expected.

Can't we unifdef out in scripts/headers_install.pl based on CONFIG_MMU?

Quoted 51 lines · Sam Ravnborg

Quoted 15 lines · Arnd Bergmann

Quoted 14 lines · Geert Uytterhoeven

Quoted 10 lines

I have used the following include guard:

#ifdef __uClinux__
#include "atomic_no.h"
#else
#include "atomic_mm.h"
#endif

gcc -E -dM for the two compilers revealed that this was the only symbol that differed.

I think you can share a toolchain for m68k and m68knommu, at least for the kernel (I used my plain m68k toolchain when experimenting with m68knommu for Amiga).

Quoted 8 lines

Quoted 6 lines

Quoted 5 lines

With the above construct we do the "right thing" also for headers exported to userspace.
But actually none of the headers using the above are subject for export at the moment so we could use a CONFIG_ symbol for the same.

So I prefer to just check CONFIG_MMU.

Some of them are, by means of include/asm-generic/Kbuild.asm, e.g. unistd.h!

I was fooled by make headers_check showing no errros. But it turns out that headers_check does not recognize includes made with "".

So I will update the patch to include revevant *_{no,mm}.h files in Kbuild.

Quoted 15 lines

I'm not sure if it's entirely correct, but I think you can use

#ifdef __KERNEL__

# ifdef CONFIG_MMU
#  include "atomic_mm.h
# else
#  include "atomic_no.h
# endif
#else
# ifndef __uClinux__
#  include "atomic_mm.h
# else
#  include "atomic_no.h
# endif
#endif

Can someone with a shared (m68k/m68knommu) please check if __uClinux__ is only set in the m68knommu case.

Use:

Quoted 4 lines

touch foo.h; gcc -E -dM

to see what is defined by the compiler.
You will also need to specify if this is for m68k or m68knommu.

Any comments from the m68knommu toolchain people?

None of my m68k-linux compilers set __uClinux__, as expected.

Quoted 21 lines

Quoted 21 lines

Quoted 4 lines

I'm not sure if it's entirely correct, but I think you can use

#ifdef __KERNEL__

Quoted 12 lines

# ifdef CONFIG_MMU
#  include "atomic_mm.h
# else
#  include "atomic_no.h
# endif
#else
# ifndef __uClinux__
#  include "atomic_mm.h
# else
#  include "atomic_no.h
# endif
#endif

Can someone with a shared (m68k/m68knommu) please check if __uClinux__ is only set in the m68knommu case.

Use:

Quoted 8 lines

Quoted 4 lines

touch foo.h; gcc -E -dM

to see what is defined by the compiler.
You will also need to specify if this is for m68k or m68knommu.

Any comments from the m68knommu toolchain people?

None of my m68k-linux compilers set __uClinux__, as expected.

A m68k-uclinux- gcc will. From a gcc-4.2.4

m68k-uclinux-gcc -E -dM /tmp/foo.h | grep -i linux

  #define __linux 1
  #define __linux__ 1
  #define __uClinux__ 1
  #define __gnu_linux__ 1
  #define linux 1

(I think that is one of the very few differences of m68k-linux over m68k-uclinux...)

I would rather just have a m68k-linux myself, and not have a separate m68k-uclinux toolchain.

Quoted 15 lines · Geert Uytterhoeven

Quoted 10 lines

I have used the following include guard:

#ifdef __uClinux__
#include "atomic_no.h"
#else
#include "atomic_mm.h"
#endif

gcc -E -dM for the two compilers revealed that this was the only symbol that differed.

I think you can share a toolchain for m68k and m68knommu, at least for the kernel (I used my plain m68k toolchain when experimenting with m68knommu for Amiga).

Quoted 7 lines

Quoted 5 lines

With the above construct we do the "right thing" also for headers exported to userspace.
But actually none of the headers using the above are subject for export at the moment so we could use a CONFIG_ symbol for the same.

So I prefer to just check CONFIG_MMU.

Some of them are, by means of include/asm-generic/Kbuild.asm, e.g. unistd.h!

I'm not sure if it's entirely correct, but I think you can use

#ifdef __KERNEL__

# ifdef CONFIG_MMU
#  include "atomic_mm.h
# else
#  include "atomic_no.h
# endif
#else
# ifndef __uClinux__
#  include "atomic_mm.h
# else
#  include "atomic_no.h
# endif
#endif

I think you can share a toolchain for m68k and m68knommu, at least for the kernel (I used my plain m68k toolchain when experimenting with m68knommu for Amiga).

Quoted 3 lines · Geert Uytterhoeven

I think you can share a toolchain for m68k and m68knommu, at least for the kernel (I used my plain m68k toolchain when experimenting with m68knommu for Amiga).

The coldfire (m68knommu) doesn't have some instructions; this caused us some grief in the assembly code exported from m68k for byte order in user-space.

Sure, but that one is nicely protected by "#if defined (__mcfisaaplus__) || defined (__mcfisac__)", right?

Quoted 2 lines · Geert Uytterhoeven

Sure, but that one is nicely protected by "#if defined (__mcfisaaplus__) || defined (__mcfisac__)", right?

Well, that was the patch we had to apply.
It wasn't in the baseline kernel.org kernel.

[this mail is cross posted to uclinux mailing list which is subscriber only]

Following is a pseudo patch (a script + a patch) that merges the include files for m68k and m68knommu in one place at:

Quoted 1 line

From 5a8b9717a399679c4753e596ea864b02a1197025 Mon Sep 17 00:00:00 2001

From: Sam Ravnborg <[email protected]>
Date: Sat, 13 Dec 2008 21:23:08 +0100
Subject: [PATCH] m68k,m68knommu: merge header files

Merge header files for m68k and m68knommu to the single location:

arch/m68k/include/asm

The majority of this patch was the result of the
script that is included in the changelog below.

The script was originally written by Arnd Bergman and

exten by me to cover a few more files.

When the header files differed the script uses the following:

The original m68k file is named <file>_mm.h [mm for memory manager] The m68knommu file is named <file>_no.h [no for no memory manager]

The files uses the following include guard:

This include gaurd works as the m68knommu toolchain set

the __uClinux__ symbol - so this should work in userspace too.

Merging the header files for m68k and m68knommu exposes the (unexpected?) ABI differences thus it is easier to actually identify these and thus to fix them.

The commit has been build tested with both a m68k and a m68knommu toolchain - with success.

The commit has also been tested with "make headers_check" and this patch fixes make headers_check for m68knommu.

The script used:
TARGET=arch/m68k/include/asm
SOURCE=arch/m68knommu/include/asm

INCLUDE="cachectl.h errno.h fcntl.h hwtest.h ioctls.h ipcbuf.h \
linkage.h math-emu.h md.h mman.h movs.h msgbuf.h openprom.h \
oplib.h poll.h posix_types.h resource.h rtc.h sembuf.h shmbuf.h \
shm.h shmparam.h socket.h sockios.h spinlock.h statfs.h stat.h \
termbits.h termios.h tlb.h types.h user.h"

EQUAL="auxvec.h cputime.h device.h emergency-restart.h futex.h \
ioctl.h irq_regs.h kdebug.h local.h mutex.h percpu.h \
sections.h topology.h"

NOMUUFILES="anchor.h bootstd.h coldfire.h commproc.h dbg.h \

elia.h flat.h m5206sim.h m520xsim.h m523xsim.h m5249sim.h \
m5272sim.h m527xsim.h m528xsim.h m5307sim.h m532xsim.h \
m5407sim.h m68360_enet.h m68360.h m68360_pram.h m68360_quicc.h \
m68360_regs.h MC68328.h MC68332.h MC68EZ328.h MC68VZ328.h \
mcfcache.h mcfdma.h mcfmbus.h mcfne.h mcfpci.h mcfpit.h \
mcfsim.h mcfsmc.h mcftimer.h mcfuart.h mcfwdebug.h \
nettel.h quicc_simple.h smp.h"

FILES="atomic.h bitops.h bootinfo.h bug.h bugs.h byteorder.h cache.h \
cacheflush.h checksum.h current.h delay.h div64.h \
dma-mapping.h dma.h elf.h entry.h fb.h fpu.h hardirq.h hw_irq.h io.h \
irq.h kmap_types.h machdep.h mc146818rtc.h mmu.h mmu_context.h \
module.h page.h page_offset.h param.h pci.h pgalloc.h \
pgtable.h processor.h ptrace.h scatterlist.h segment.h \
setup.h sigcontext.h siginfo.h signal.h string.h system.h \
thread_info.h timex.h tlbflush.h traps.h uaccess.h ucontext.h \
unaligned.h unistd.h"

mergefile() {
	BASE=${1%.h}
	git mv ${SOURCE}/$1 ${TARGET}/${BASE}_no.h
	git mv ${TARGET}/$1 ${TARGET}/${BASE}_mm.h

cat << EOF > ${TARGET}/$1
EOF

	git add ${TARGET}/$1
}

set -e

mkdir -p ${TARGET}

git mv include/asm-m68k/* ${TARGET}
rmdir include/asm-m68k

git rm ${SOURCE}/Kbuild
for F in $INCLUDE $EQUAL; do

	git rm ${SOURCE}/$F

done

for F in $NOMUUFILES; do

	git mv ${SOURCE}/$F ${TARGET}/$F

done

for F in $FILES ; do
mergefile $F
done

rmdir arch/m68knommu/include/asm
rmdir arch/m68knommu/include

Cc Arnd Bergmann <[email protected]>

Cc Geert Uytterhoeven <[email protected]>

Cc Greg Ungerer <[email protected]>

Signed-off-by Sam Ravnborg <[email protected]>

Quoted 99 lines · Sam Ravnborg

Quoted 1 line

From 5a8b9717a399679c4753e596ea864b02a1197025 Mon Sep 17 00:00:00 2001

From: Sam Ravnborg <[email protected]>
Date: Sat, 13 Dec 2008 21:23:08 +0100
Subject: [PATCH] m68k,m68knommu: merge header files

Merge header files for m68k and m68knommu to the single location:

arch/m68k/include/asm

The majority of this patch was the result of the
script that is included in the changelog below.

The script was originally written by Arnd Bergman and exten by me to cover a few more files.

When the header files differed the script uses the following:

The original m68k file is named <file>_mm.h [mm for memory manager] The m68knommu file is named <file>_no.h [no for no memory manager]

The files uses the following include guard:

This include gaurd works as the m68knommu toolchain set the __uClinux__ symbol - so this should work in userspace too.

Merging the header files for m68k and m68knommu exposes the (unexpected?) ABI differences thus it is easier to actually identify these and thus to fix them.

The commit has been build tested with both a m68k and a m68knommu toolchain - with success.

The commit has also been tested with "make headers_check" and this patch fixes make headers_check for m68knommu.

The script used:
TARGET=arch/m68k/include/asm
SOURCE=arch/m68knommu/include/asm

INCLUDE="cachectl.h errno.h fcntl.h hwtest.h ioctls.h ipcbuf.h \
linkage.h math-emu.h md.h mman.h movs.h msgbuf.h openprom.h \
oplib.h poll.h posix_types.h resource.h rtc.h sembuf.h shmbuf.h \
shm.h shmparam.h socket.h sockios.h spinlock.h statfs.h stat.h \
termbits.h termios.h tlb.h types.h user.h"

EQUAL="auxvec.h cputime.h device.h emergency-restart.h futex.h \
ioctl.h irq_regs.h kdebug.h local.h mutex.h percpu.h \
sections.h topology.h"

NOMUUFILES="anchor.h bootstd.h coldfire.h commproc.h dbg.h \
elia.h flat.h m5206sim.h m520xsim.h m523xsim.h m5249sim.h \
m5272sim.h m527xsim.h m528xsim.h m5307sim.h m532xsim.h \
m5407sim.h m68360_enet.h m68360.h m68360_pram.h m68360_quicc.h \
m68360_regs.h MC68328.h MC68332.h MC68EZ328.h MC68VZ328.h \
mcfcache.h mcfdma.h mcfmbus.h mcfne.h mcfpci.h mcfpit.h \
mcfsim.h mcfsmc.h mcftimer.h mcfuart.h mcfwdebug.h \
nettel.h quicc_simple.h smp.h"

FILES="atomic.h bitops.h bootinfo.h bug.h bugs.h byteorder.h cache.h \
cacheflush.h checksum.h current.h delay.h div64.h \
dma-mapping.h dma.h elf.h entry.h fb.h fpu.h hardirq.h hw_irq.h io.h \
irq.h kmap_types.h machdep.h mc146818rtc.h mmu.h mmu_context.h \
module.h page.h page_offset.h param.h pci.h pgalloc.h \
pgtable.h processor.h ptrace.h scatterlist.h segment.h \
setup.h sigcontext.h siginfo.h signal.h string.h system.h \
thread_info.h timex.h tlbflush.h traps.h uaccess.h ucontext.h \
unaligned.h unistd.h"

mergefile() {
	BASE=${1%.h}
	git mv ${SOURCE}/$1 ${TARGET}/${BASE}_no.h
	git mv ${TARGET}/$1 ${TARGET}/${BASE}_mm.h

cat << EOF > ${TARGET}/$1
EOF

	git add ${TARGET}/$1
}

set -e

mkdir -p ${TARGET}

git mv include/asm-m68k/* ${TARGET}
rmdir include/asm-m68k

git rm ${SOURCE}/Kbuild
for F in $INCLUDE $EQUAL; do

	git rm ${SOURCE}/$F

done

for F in $NOMUUFILES; do

	git mv ${SOURCE}/$F ${TARGET}/$F

done

for F in $FILES ; do
mergefile $F
done

Quoted 7 lines

rmdir arch/m68knommu/include/asm
rmdir arch/m68knommu/include

Cc Arnd Bergmann <[email protected]>

Cc Geert Uytterhoeven <[email protected]>

Cc Greg Ungerer <[email protected]>

Signed-off-by Sam Ravnborg <[email protected]>

So I took this, applied, and have been running some tests on m68knommu.

I had to make 2 small changes to make it work on 2.6.29-rc1. I had to add swab.h into the list of FILES, and move the seting of hdr-arch for m68knommu in the top level Makefile to after the global hdr-arch setting (so all of about 3 lines later).

Otherwise it builds and runs fine for m68knommu in all cases I have tested so far.

I have this applied as the only change at:

git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git
m68k-merge-includes

Sam Ravnborg (1):
m68k,m68knommu: merge header files

More review, testing, comments welcome...
Where to from here?

Quoted 110 lines · Greg Ungerer

Quoted 99 lines · Sam Ravnborg

Quoted 1 line

From 5a8b9717a399679c4753e596ea864b02a1197025 Mon Sep 17 00:00:00 2001

From: Sam Ravnborg <[email protected]>
Date: Sat, 13 Dec 2008 21:23:08 +0100
Subject: [PATCH] m68k,m68knommu: merge header files

Merge header files for m68k and m68knommu to the single location:

arch/m68k/include/asm

The majority of this patch was the result of the
script that is included in the changelog below.

The script was originally written by Arnd Bergman and exten by me to cover a few more files.

When the header files differed the script uses the following:

The original m68k file is named <file>_mm.h [mm for memory manager] The m68knommu file is named <file>_no.h [no for no memory manager]

The files uses the following include guard:

This include gaurd works as the m68knommu toolchain set the __uClinux__ symbol - so this should work in userspace too.

Merging the header files for m68k and m68knommu exposes the (unexpected?) ABI differences thus it is easier to actually identify these and thus to fix them.

The commit has been build tested with both a m68k and a m68knommu toolchain - with success.

The commit has also been tested with "make headers_check" and this patch fixes make headers_check for m68knommu.

The script used:
TARGET=arch/m68k/include/asm
SOURCE=arch/m68knommu/include/asm

INCLUDE="cachectl.h errno.h fcntl.h hwtest.h ioctls.h ipcbuf.h \
linkage.h math-emu.h md.h mman.h movs.h msgbuf.h openprom.h \
oplib.h poll.h posix_types.h resource.h rtc.h sembuf.h shmbuf.h \
shm.h shmparam.h socket.h sockios.h spinlock.h statfs.h stat.h \
termbits.h termios.h tlb.h types.h user.h"

EQUAL="auxvec.h cputime.h device.h emergency-restart.h futex.h \
ioctl.h irq_regs.h kdebug.h local.h mutex.h percpu.h \
sections.h topology.h"

NOMUUFILES="anchor.h bootstd.h coldfire.h commproc.h dbg.h \
elia.h flat.h m5206sim.h m520xsim.h m523xsim.h m5249sim.h \
m5272sim.h m527xsim.h m528xsim.h m5307sim.h m532xsim.h \
m5407sim.h m68360_enet.h m68360.h m68360_pram.h m68360_quicc.h \
m68360_regs.h MC68328.h MC68332.h MC68EZ328.h MC68VZ328.h \
mcfcache.h mcfdma.h mcfmbus.h mcfne.h mcfpci.h mcfpit.h \
mcfsim.h mcfsmc.h mcftimer.h mcfuart.h mcfwdebug.h \
nettel.h quicc_simple.h smp.h"

FILES="atomic.h bitops.h bootinfo.h bug.h bugs.h byteorder.h cache.h \
cacheflush.h checksum.h current.h delay.h div64.h \
dma-mapping.h dma.h elf.h entry.h fb.h fpu.h hardirq.h hw_irq.h io.h \
irq.h kmap_types.h machdep.h mc146818rtc.h mmu.h mmu_context.h \
module.h page.h page_offset.h param.h pci.h pgalloc.h \
pgtable.h processor.h ptrace.h scatterlist.h segment.h \
setup.h sigcontext.h siginfo.h signal.h string.h system.h \
thread_info.h timex.h tlbflush.h traps.h uaccess.h ucontext.h \
unaligned.h unistd.h"

mergefile() {
	BASE=${1%.h}
	git mv ${SOURCE}/$1 ${TARGET}/${BASE}_no.h
	git mv ${TARGET}/$1 ${TARGET}/${BASE}_mm.h

cat << EOF > ${TARGET}/$1
EOF

	git add ${TARGET}/$1
}

set -e

mkdir -p ${TARGET}

git mv include/asm-m68k/* ${TARGET}
rmdir include/asm-m68k

git rm ${SOURCE}/Kbuild
for F in $INCLUDE $EQUAL; do

	git rm ${SOURCE}/$F

done

for F in $NOMUUFILES; do

	git mv ${SOURCE}/$F ${TARGET}/$F

done

for F in $FILES ; do
mergefile $F
done

Quoted 7 lines

rmdir arch/m68knommu/include/asm
rmdir arch/m68knommu/include

Cc Arnd Bergmann <[email protected]>

Cc Geert Uytterhoeven <[email protected]>

Cc Greg Ungerer <[email protected]>

Signed-off-by Sam Ravnborg <[email protected]>

So I took this, applied, and have been running some tests on m68knommu.

Quoted 7 lines

I had to make 2 small changes to make it work on 2.6.29-rc1. I had to add swab.h into the list of FILES, and move the seting of hdr-arch for m68knommu in the top level Makefile to after the global hdr-arch setting (so all of about 3 lines later).

Otherwise it builds and runs fine for m68knommu in all cases I have tested so far.

Thanks!

Quoted 4 lines

I have this applied as the only change at:

git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git
m68k-merge-includes

Huh, is this git repository really ca. 200 MiB?

Quoted 6 lines

Sam Ravnborg (1):
m68k,m68knommu: merge header files

More review, testing, comments welcome...
Where to from here?

I'll pull from it and give it some m68k test builds.
After that, you can move it to for-next. If everything's well, it can go to Linus.

Or should I amend and add my SoB and put it in m68k for-next?

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

Quoted 7 lines

Quoted 3 lines

More review, testing, comments welcome...
Where to from here?

I'll pull from it and give it some m68k test builds.
After that, you can move it to for-next. If everything's well, it can go to Linus.

Sounds like a plan.

Quoted 1 line

Or should I amend and add my SoB and put it in m68k for-next?

I am happy to go either way.

Quoted 10 lines

Quoted 6 lines

Quoted 2 lines

More review, testing, comments welcome...
Where to from here?

I'll pull from it and give it some m68k test builds.
After that, you can move it to for-next. If everything's well, it can go to Linus.

Sounds like a plan.

Quoted 3 lines

Quoted 1 line

Or should I amend and add my SoB and put it in m68k for-next?

I am happy to go either way.

For my part I like this to reach mainline ASAP. So whatever suits the two of you is fine with me.

Quoted 5 lines · Sam Ravnborg

Quoted 5 lines

Quoted 5 lines

Quoted 2 lines

More review, testing, comments welcome...
Where to from here?

I'll pull from it and give it some m68k test builds.
After that, you can move it to for-next. If everything's well, it can go to Linus.

Quoted 7 lines

Quoted 5 lines

Sounds like a plan.

Quoted 1 line

Or should I amend and add my SoB and put it in m68k for-next?

I am happy to go either way.

For my part I like this to reach mainline ASAP. So whatever suits the two of you is fine with me.

I pulled from Greg's tree, and built atari_defconfig, multi_defconfig, sun3_defconfig. Atari_defconfig runs fine under ARAnyM.

As I'll be on a business trip to Japan next week, I probably won't be able to do a proper follow-up. So Greg, can you put it on your for-next branch and send it to Linus if everything goes well?

Acked-by Geert Uytterhoeven <[email protected]>

[this mail is cross posted to uclinux mailing list which is subscriber only]

Following is a pseudo patch (a script + a patch) that merges the include files for m68k and m68knommu in one place at: