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 swab.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 <arnd@arndb.de>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>

Makefile

@@ -213,6 +213,10 @@ endif
 # Where to locate arch specific headers
 hdr-arch  := $(SRCARCH)
 
+ifeq ($(ARCH),m68knommu)
+       hdr-arch  := m68k
+endif
+
 KCONFIG_CONFIG	?= .config
 
 # SHELL used by kbuild

arch/m68k/include/asm/atomic.h

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

arch/m68k/include/asm/bitops.h

+#ifdef __uClinux__
+#include "bitops_no.h"
+#else
+#include "bitops_mm.h"
+#endif

arch/m68k/include/asm/bootinfo.h

+#ifdef __uClinux__
+#include "bootinfo_no.h"
+#else
+#include "bootinfo_mm.h"
+#endif

arch/m68k/include/asm/bug.h

+#ifdef __uClinux__
+#include "bug_no.h"
+#else
+#include "bug_mm.h"
+#endif

arch/m68k/include/asm/bugs.h

+#ifdef __uClinux__
+#include "bugs_no.h"
+#else
+#include "bugs_mm.h"
+#endif

arch/m68k/include/asm/byteorder.h

+#ifdef __uClinux__
+#include "byteorder_no.h"
+#else
+#include "byteorder_mm.h"
+#endif

arch/m68k/include/asm/cache.h

+#ifdef __uClinux__
+#include "cache_no.h"
+#else
+#include "cache_mm.h"
+#endif

arch/m68k/include/asm/cacheflush.h

+#ifdef __uClinux__
+#include "cacheflush_no.h"
+#else
+#include "cacheflush_mm.h"
+#endif

arch/m68k/include/asm/checksum.h

+#ifdef __uClinux__
+#include "checksum_no.h"
+#else
+#include "checksum_mm.h"
+#endif

arch/m68k/include/asm/current.h

+#ifdef __uClinux__
+#include "current_no.h"
+#else
+#include "current_mm.h"
+#endif

arch/m68k/include/asm/delay.h

+#ifdef __uClinux__
+#include "delay_no.h"
+#else
+#include "delay_mm.h"
+#endif

arch/m68k/include/asm/div64.h

+#ifdef __uClinux__
+#include "div64_no.h"
+#else
+#include "div64_mm.h"
+#endif

arch/m68k/include/asm/dma-mapping.h

+#ifdef __uClinux__
+#include "dma-mapping_no.h"
+#else
+#include "dma-mapping_mm.h"
+#endif

arch/m68k/include/asm/dma.h

+#ifdef __uClinux__
+#include "dma_no.h"
+#else
+#include "dma_mm.h"
+#endif

arch/m68k/include/asm/elf.h

+#ifdef __uClinux__
+#include "elf_no.h"
+#else
+#include "elf_mm.h"
+#endif

arch/m68k/include/asm/entry.h

+#ifdef __uClinux__
+#include "entry_no.h"
+#else
+#include "entry_mm.h"
+#endif

arch/m68k/include/asm/fb.h

+#ifdef __uClinux__
+#include "fb_no.h"
+#else
+#include "fb_mm.h"
+#endif

arch/m68k/include/asm/fpu.h

+#ifdef __uClinux__
+#include "fpu_no.h"
+#else
+#include "fpu_mm.h"
+#endif

arch/m68k/include/asm/hardirq.h

+#ifdef __uClinux__
+#include "hardirq_no.h"
+#else
+#include "hardirq_mm.h"
+#endif

arch/m68k/include/asm/hw_irq.h

+#ifdef __uClinux__
+#include "hw_irq_no.h"
+#else
+#include "hw_irq_mm.h"
+#endif

arch/m68k/include/asm/io.h

+#ifdef __uClinux__
+#include "io_no.h"
+#else
+#include "io_mm.h"
+#endif

arch/m68k/include/asm/irq.h

+#ifdef __uClinux__
+#include "irq_no.h"
+#else
+#include "irq_mm.h"
+#endif

arch/m68k/include/asm/kmap_types.h

+#ifdef __uClinux__
+#include "kmap_types_no.h"
+#else
+#include "kmap_types_mm.h"
+#endif

arch/m68k/include/asm/machdep.h

+#ifdef __uClinux__
+#include "machdep_no.h"
+#else
+#include "machdep_mm.h"
+#endif

arch/m68k/include/asm/mc146818rtc.h

+#ifdef __uClinux__
+#include "mc146818rtc_no.h"
+#else
+#include "mc146818rtc_mm.h"
+#endif

arch/m68k/include/asm/mmu.h

+#ifdef __uClinux__
+#include "mmu_no.h"
+#else
+#include "mmu_mm.h"
+#endif

arch/m68k/include/asm/mmu_context.h

+#ifdef __uClinux__
+#include "mmu_context_no.h"
+#else
+#include "mmu_context_mm.h"
+#endif

arch/m68k/include/asm/module.h

+#ifdef __uClinux__
+#include "module_no.h"
+#else
+#include "module_mm.h"
+#endif

arch/m68k/include/asm/page.h

+#ifdef __uClinux__
+#include "page_no.h"
+#else
+#include "page_mm.h"
+#endif

arch/m68k/include/asm/page_offset.h

+#ifdef __uClinux__
+#include "page_offset_no.h"
+#else
+#include "page_offset_mm.h"
+#endif

arch/m68k/include/asm/param.h

+#ifdef __uClinux__
+#include "param_no.h"
+#else
+#include "param_mm.h"
+#endif

arch/m68k/include/asm/pci.h

+#ifdef __uClinux__
+#include "pci_no.h"
+#else
+#include "pci_mm.h"
+#endif

arch/m68knommu/include/asm/pci.h → arch/m68k/include/asm/pci_no.h

 #ifndef M68KNOMMU_PCI_H
 #define	M68KNOMMU_PCI_H
 
-#include <asm-m68k/pci.h>
+#include <asm/pci_mm.h>
 
 #ifdef CONFIG_COMEMPCI
 /*

arch/m68k/include/asm/pgalloc.h

+#ifdef __uClinux__
+#include "pgalloc_no.h"
+#else
+#include "pgalloc_mm.h"
+#endif

arch/m68k/include/asm/pgtable.h

+#ifdef __uClinux__
+#include "pgtable_no.h"
+#else
+#include "pgtable_mm.h"
+#endif

arch/m68k/include/asm/processor.h

+#ifdef __uClinux__
+#include "processor_no.h"
+#else
+#include "processor_mm.h"
+#endif

arch/m68k/include/asm/ptrace.h

+#ifdef __uClinux__
+#include "ptrace_no.h"
+#else
+#include "ptrace_mm.h"
+#endif

arch/m68k/include/asm/scatterlist.h

+#ifdef __uClinux__
+#include "scatterlist_no.h"
+#else
+#include "scatterlist_mm.h"
+#endif

arch/m68k/include/asm/segment.h

+#ifdef __uClinux__
+#include "segment_no.h"
+#else
+#include "segment_mm.h"
+#endif

arch/m68k/include/asm/setup.h

+#ifdef __uClinux__
+#include "setup_no.h"
+#else
+#include "setup_mm.h"
+#endif

arch/m68knommu/include/asm/setup.h → arch/m68k/include/asm/setup_no.h

 #ifdef __KERNEL__
 
-#include <asm-m68k/setup.h>
+#include <asm/setup_mm.h>
 
 /* We have a bigger command line buffer. */
 #undef COMMAND_LINE_SIZE

arch/m68k/include/asm/sigcontext.h

+#ifdef __uClinux__
+#include "sigcontext_no.h"
+#else
+#include "sigcontext_mm.h"
+#endif

arch/m68k/include/asm/siginfo.h

+#ifdef __uClinux__
+#include "siginfo_no.h"
+#else
+#include "siginfo_mm.h"
+#endif

arch/m68k/include/asm/signal.h

+#ifdef __uClinux__
+#include "signal_no.h"
+#else
+#include "signal_mm.h"
+#endif

arch/m68k/include/asm/string.h

+#ifdef __uClinux__
+#include "string_no.h"
+#else
+#include "string_mm.h"
+#endif

arch/m68k/include/asm/system.h

+#ifdef __uClinux__
+#include "system_no.h"
+#else
+#include "system_mm.h"
+#endif

arch/m68k/include/asm/thread_info.h

+#ifdef __uClinux__
+#include "thread_info_no.h"
+#else
+#include "thread_info_mm.h"
+#endif

arch/m68k/include/asm/timex.h

+#ifdef __uClinux__
+#include "timex_no.h"
+#else
+#include "timex_mm.h"
+#endif

arch/m68k/include/asm/tlbflush.h

+#ifdef __uClinux__
+#include "tlbflush_no.h"
+#else
+#include "tlbflush_mm.h"
+#endif

arch/m68k/include/asm/traps.h

+#ifdef __uClinux__
+#include "traps_no.h"
+#else
+#include "traps_mm.h"
+#endif

arch/m68k/include/asm/uaccess.h

+#ifdef __uClinux__
+#include "uaccess_no.h"
+#else
+#include "uaccess_mm.h"
+#endif

arch/m68k/include/asm/ucontext.h

+#ifdef __uClinux__
+#include "ucontext_no.h"
+#else
+#include "ucontext_mm.h"
+#endif

arch/m68k/include/asm/unaligned.h

+#ifdef __uClinux__
+#include "unaligned_no.h"
+#else
+#include "unaligned_mm.h"
+#endif

arch/m68k/include/asm/unistd.h

+#ifdef __uClinux__
+#include "unistd_no.h"
+#else
+#include "unistd_mm.h"
+#endif

arch/m68knommu/include/asm/Kbuild

-include include/asm-generic/Kbuild.asm
-
-unifdef-y += swab.h

arch/m68knommu/include/asm/cachectl.h

-#include <asm-m68k/cachectl.h>

arch/m68knommu/include/asm/cputime.h

-#ifndef __M68KNOMMU_CPUTIME_H
-#define __M68KNOMMU_CPUTIME_H
-
-#include <asm-generic/cputime.h>
-
-#endif /* __M68KNOMMU_CPUTIME_H */

arch/m68knommu/include/asm/errno.h

-#include <asm-m68k/errno.h>

arch/m68knommu/include/asm/fcntl.h

-#include <asm-m68k/fcntl.h>

arch/m68knommu/include/asm/hwtest.h

-#include <asm-m68k/hwtest.h>

arch/m68knommu/include/asm/ioctls.h

-#include <asm-m68k/ioctls.h>

arch/m68knommu/include/asm/ipcbuf.h

-#include <asm-m68k/ipcbuf.h>

arch/m68knommu/include/asm/linkage.h

-#include <asm-m68k/linkage.h>

arch/m68knommu/include/asm/local.h

-#ifndef __M68KNOMMU_LOCAL_H
-#define __M68KNOMMU_LOCAL_H
-
-#include <asm-generic/local.h>
-
-#endif /* __M68KNOMMU_LOCAL_H */

arch/m68knommu/include/asm/math-emu.h

-#include <asm-m68k/math-emu.h>

arch/m68knommu/include/asm/md.h

-#include <asm-m68k/md.h>

arch/m68knommu/include/asm/mman.h

-#include <asm-m68k/mman.h>

arch/m68knommu/include/asm/movs.h

-#include <asm-m68k/movs.h>

arch/m68knommu/include/asm/msgbuf.h

-#include <asm-m68k/msgbuf.h>

arch/m68knommu/include/asm/openprom.h

-#include <asm-m68k/openprom.h>

arch/m68knommu/include/asm/oplib.h

-#include <asm-m68k/oplib.h>

arch/m68knommu/include/asm/percpu.h

-#ifndef __ARCH_M68KNOMMU_PERCPU__
-#define __ARCH_M68KNOMMU_PERCPU__
-
-#include <asm-generic/percpu.h>
-
-#endif /* __ARCH_M68KNOMMU_PERCPU__ */

arch/m68knommu/include/asm/poll.h

-#include <asm-m68k/poll.h>

arch/m68knommu/include/asm/posix_types.h

-#include <asm-m68k/posix_types.h>

arch/m68knommu/include/asm/resource.h

-#include <asm-m68k/resource.h>

arch/m68knommu/include/asm/rtc.h

-#include <asm-m68k/rtc.h>

arch/m68knommu/include/asm/sections.h

-#ifndef _M68KNOMMU_SECTIONS_H
-#define _M68KNOMMU_SECTIONS_H
-
-/* nothing to see, move along */
-#include <asm-generic/sections.h>
-
-#endif

arch/m68knommu/include/asm/sembuf.h

-#include <asm-m68k/sembuf.h>

arch/m68knommu/include/asm/shm.h

-#include <asm-m68k/shm.h>

arch/m68knommu/include/asm/shmbuf.h

-#include <asm-m68k/shmbuf.h>

arch/m68knommu/include/asm/shmparam.h

-#include <asm-m68k/shmparam.h>

arch/m68knommu/include/asm/socket.h

-#include <asm-m68k/socket.h>

arch/m68knommu/include/asm/sockios.h

-#include <asm-m68k/sockios.h>

arch/m68knommu/include/asm/spinlock.h

-#include <asm-m68k/spinlock.h>

arch/m68knommu/include/asm/stat.h

-#include <asm-m68k/stat.h>

arch/m68knommu/include/asm/statfs.h

-#include <asm-m68k/statfs.h>

arch/m68knommu/include/asm/termbits.h

-#include <asm-m68k/termbits.h>

arch/m68knommu/include/asm/termios.h

-#include <asm-m68k/termios.h>

arch/m68knommu/include/asm/tlb.h

-#include <asm-m68k/tlb.h>

arch/m68knommu/include/asm/types.h

-#include <asm-m68k/types.h>

arch/m68knommu/include/asm/user.h

-#include <asm-m68k/user.h>

include/asm-m68k/auxvec.h

-#ifndef __ASMm68k_AUXVEC_H
-#define __ASMm68k_AUXVEC_H
-
-#endif

include/asm-m68k/device.h

-/*
- * Arch specific extensions to struct device
- *
- * This file is released under the GPLv2
- */
-#include <asm-generic/device.h>
-

include/asm-m68k/emergency-restart.h

-#ifndef _ASM_EMERGENCY_RESTART_H
-#define _ASM_EMERGENCY_RESTART_H
-
-#include <asm-generic/emergency-restart.h>
-
-#endif /* _ASM_EMERGENCY_RESTART_H */

include/asm-m68k/futex.h

-#ifndef _ASM_FUTEX_H
-#define _ASM_FUTEX_H
-
-#include <asm-generic/futex.h>
-
-#endif

include/asm-m68k/ioctl.h

-#include <asm-generic/ioctl.h>

include/asm-m68k/irq_regs.h

-#include <asm-generic/irq_regs.h>

include/asm-m68k/kdebug.h

-#include <asm-generic/kdebug.h>

include/asm-m68k/mutex.h

-/*
- * Pull in the generic implementation for the mutex fastpath.
- *
- * TODO: implement optimized primitives instead, or leave the generic
- * implementation in place, or pick the atomic_xchg() based generic
- * implementation. (see asm-generic/mutex-xchg.h for details)
- */
-
-#include <asm-generic/mutex-dec.h>

include/asm-m68k/topology.h

-#ifndef _ASM_M68K_TOPOLOGY_H
-#define _ASM_M68K_TOPOLOGY_H
-
-#include <asm-generic/topology.h>
-
-#endif /* _ASM_M68K_TOPOLOGY_H */