m68k,m68knommu: merge header files
authorSam Ravnborg <sam@ravnborg.org>
Fri, 16 Jan 2009 11:58:10 +0000 (21:58 +1000)
committerGreg Ungerer <gerg@uclinux.org>
Fri, 16 Jan 2009 11:58:10 +0000 (21:58 +1000)
commit49148020bcb6910ce71417bd990a5ce7017f9bd3
treee410cc433a69075a0254ee4000cb10d71df3a641
parentae04d1401577bb63151480a053057de58b8e10bb
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>
355 files changed:
Makefile
arch/m68k/include/asm/Kbuild [moved from include/asm-m68k/Kbuild with 100% similarity]
arch/m68k/include/asm/MC68328.h [moved from arch/m68knommu/include/asm/MC68328.h with 100% similarity]
arch/m68k/include/asm/MC68332.h [moved from arch/m68knommu/include/asm/MC68332.h with 100% similarity]
arch/m68k/include/asm/MC68EZ328.h [moved from arch/m68knommu/include/asm/MC68EZ328.h with 100% similarity]
arch/m68k/include/asm/MC68VZ328.h [moved from arch/m68knommu/include/asm/MC68VZ328.h with 100% similarity]
arch/m68k/include/asm/a.out-core.h [moved from include/asm-m68k/a.out-core.h with 100% similarity]
arch/m68k/include/asm/a.out.h [moved from include/asm-m68k/a.out.h with 100% similarity]
arch/m68k/include/asm/adb_iop.h [moved from include/asm-m68k/adb_iop.h with 100% similarity]
arch/m68k/include/asm/amigahw.h [moved from include/asm-m68k/amigahw.h with 100% similarity]
arch/m68k/include/asm/amigaints.h [moved from include/asm-m68k/amigaints.h with 100% similarity]
arch/m68k/include/asm/amigayle.h [moved from include/asm-m68k/amigayle.h with 100% similarity]
arch/m68k/include/asm/amipcmcia.h [moved from include/asm-m68k/amipcmcia.h with 100% similarity]
arch/m68k/include/asm/anchor.h [moved from arch/m68knommu/include/asm/anchor.h with 100% similarity]
arch/m68k/include/asm/apollodma.h [moved from include/asm-m68k/apollodma.h with 100% similarity]
arch/m68k/include/asm/apollohw.h [moved from include/asm-m68k/apollohw.h with 100% similarity]
arch/m68k/include/asm/atafd.h [moved from include/asm-m68k/atafd.h with 100% similarity]
arch/m68k/include/asm/atafdreg.h [moved from include/asm-m68k/atafdreg.h with 100% similarity]
arch/m68k/include/asm/atari_joystick.h [moved from include/asm-m68k/atari_joystick.h with 100% similarity]
arch/m68k/include/asm/atari_stdma.h [moved from include/asm-m68k/atari_stdma.h with 100% similarity]
arch/m68k/include/asm/atari_stram.h [moved from include/asm-m68k/atari_stram.h with 100% similarity]
arch/m68k/include/asm/atarihw.h [moved from include/asm-m68k/atarihw.h with 100% similarity]
arch/m68k/include/asm/atariints.h [moved from include/asm-m68k/atariints.h with 100% similarity]
arch/m68k/include/asm/atarikb.h [moved from include/asm-m68k/atarikb.h with 100% similarity]
arch/m68k/include/asm/atomic.h [new file with mode: 0644]
arch/m68k/include/asm/atomic_mm.h [moved from include/asm-m68k/atomic.h with 100% similarity]
arch/m68k/include/asm/atomic_no.h [moved from arch/m68knommu/include/asm/atomic.h with 100% similarity]
arch/m68k/include/asm/auxvec.h [moved from include/asm-m68k/auxvec.h with 100% similarity]
arch/m68k/include/asm/bitops.h [new file with mode: 0644]
arch/m68k/include/asm/bitops_mm.h [moved from include/asm-m68k/bitops.h with 100% similarity]
arch/m68k/include/asm/bitops_no.h [moved from arch/m68knommu/include/asm/bitops.h with 100% similarity]
arch/m68k/include/asm/blinken.h [moved from include/asm-m68k/blinken.h with 100% similarity]
arch/m68k/include/asm/bootinfo.h [new file with mode: 0644]
arch/m68k/include/asm/bootinfo_mm.h [moved from include/asm-m68k/bootinfo.h with 100% similarity]
arch/m68k/include/asm/bootinfo_no.h [moved from arch/m68knommu/include/asm/bootinfo.h with 100% similarity]
arch/m68k/include/asm/bootstd.h [moved from arch/m68knommu/include/asm/bootstd.h with 100% similarity]
arch/m68k/include/asm/bug.h [new file with mode: 0644]
arch/m68k/include/asm/bug_mm.h [moved from include/asm-m68k/bug.h with 100% similarity]
arch/m68k/include/asm/bug_no.h [moved from arch/m68knommu/include/asm/bug.h with 100% similarity]
arch/m68k/include/asm/bugs.h [new file with mode: 0644]
arch/m68k/include/asm/bugs_mm.h [moved from include/asm-m68k/bugs.h with 100% similarity]
arch/m68k/include/asm/bugs_no.h [moved from arch/m68knommu/include/asm/bugs.h with 100% similarity]
arch/m68k/include/asm/bvme6000hw.h [moved from include/asm-m68k/bvme6000hw.h with 100% similarity]
arch/m68k/include/asm/byteorder.h [new file with mode: 0644]
arch/m68k/include/asm/byteorder_mm.h [moved from include/asm-m68k/byteorder.h with 100% similarity]
arch/m68k/include/asm/byteorder_no.h [moved from arch/m68knommu/include/asm/byteorder.h with 100% similarity]
arch/m68k/include/asm/cache.h [new file with mode: 0644]
arch/m68k/include/asm/cache_mm.h [moved from include/asm-m68k/cache.h with 100% similarity]
arch/m68k/include/asm/cache_no.h [moved from arch/m68knommu/include/asm/cache.h with 100% similarity]
arch/m68k/include/asm/cachectl.h [moved from include/asm-m68k/cachectl.h with 100% similarity]
arch/m68k/include/asm/cacheflush.h [new file with mode: 0644]
arch/m68k/include/asm/cacheflush_mm.h [moved from include/asm-m68k/cacheflush.h with 100% similarity]
arch/m68k/include/asm/cacheflush_no.h [moved from arch/m68knommu/include/asm/cacheflush.h with 100% similarity]
arch/m68k/include/asm/checksum.h [new file with mode: 0644]
arch/m68k/include/asm/checksum_mm.h [moved from include/asm-m68k/checksum.h with 100% similarity]
arch/m68k/include/asm/checksum_no.h [moved from arch/m68knommu/include/asm/checksum.h with 100% similarity]
arch/m68k/include/asm/coldfire.h [moved from arch/m68knommu/include/asm/coldfire.h with 100% similarity]
arch/m68k/include/asm/commproc.h [moved from arch/m68knommu/include/asm/commproc.h with 100% similarity]
arch/m68k/include/asm/contregs.h [moved from include/asm-m68k/contregs.h with 100% similarity]
arch/m68k/include/asm/cputime.h [moved from include/asm-m68k/cputime.h with 100% similarity]
arch/m68k/include/asm/current.h [new file with mode: 0644]
arch/m68k/include/asm/current_mm.h [moved from include/asm-m68k/current.h with 100% similarity]
arch/m68k/include/asm/current_no.h [moved from arch/m68knommu/include/asm/current.h with 100% similarity]
arch/m68k/include/asm/dbg.h [moved from arch/m68knommu/include/asm/dbg.h with 100% similarity]
arch/m68k/include/asm/delay.h [new file with mode: 0644]
arch/m68k/include/asm/delay_mm.h [moved from include/asm-m68k/delay.h with 100% similarity]
arch/m68k/include/asm/delay_no.h [moved from arch/m68knommu/include/asm/delay.h with 100% similarity]
arch/m68k/include/asm/device.h [moved from include/asm-m68k/device.h with 100% similarity]
arch/m68k/include/asm/div64.h [new file with mode: 0644]
arch/m68k/include/asm/div64_mm.h [moved from include/asm-m68k/div64.h with 100% similarity]
arch/m68k/include/asm/div64_no.h [moved from arch/m68knommu/include/asm/div64.h with 100% similarity]
arch/m68k/include/asm/dma-mapping.h [new file with mode: 0644]
arch/m68k/include/asm/dma-mapping_mm.h [moved from include/asm-m68k/dma-mapping.h with 100% similarity]
arch/m68k/include/asm/dma-mapping_no.h [moved from arch/m68knommu/include/asm/dma-mapping.h with 100% similarity]
arch/m68k/include/asm/dma.h [new file with mode: 0644]
arch/m68k/include/asm/dma_mm.h [moved from include/asm-m68k/dma.h with 100% similarity]
arch/m68k/include/asm/dma_no.h [moved from arch/m68knommu/include/asm/dma.h with 100% similarity]
arch/m68k/include/asm/dsp56k.h [moved from include/asm-m68k/dsp56k.h with 100% similarity]
arch/m68k/include/asm/dvma.h [moved from include/asm-m68k/dvma.h with 100% similarity]
arch/m68k/include/asm/elf.h [new file with mode: 0644]
arch/m68k/include/asm/elf_mm.h [moved from include/asm-m68k/elf.h with 100% similarity]
arch/m68k/include/asm/elf_no.h [moved from arch/m68knommu/include/asm/elf.h with 100% similarity]
arch/m68k/include/asm/elia.h [moved from arch/m68knommu/include/asm/elia.h with 100% similarity]
arch/m68k/include/asm/emergency-restart.h [moved from include/asm-m68k/emergency-restart.h with 100% similarity]
arch/m68k/include/asm/entry.h [new file with mode: 0644]
arch/m68k/include/asm/entry_mm.h [moved from include/asm-m68k/entry.h with 100% similarity]
arch/m68k/include/asm/entry_no.h [moved from arch/m68knommu/include/asm/entry.h with 100% similarity]
arch/m68k/include/asm/errno.h [moved from include/asm-m68k/errno.h with 100% similarity]
arch/m68k/include/asm/fb.h [new file with mode: 0644]
arch/m68k/include/asm/fb_mm.h [moved from include/asm-m68k/fb.h with 100% similarity]
arch/m68k/include/asm/fb_no.h [moved from arch/m68knommu/include/asm/fb.h with 100% similarity]
arch/m68k/include/asm/fbio.h [moved from include/asm-m68k/fbio.h with 100% similarity]
arch/m68k/include/asm/fcntl.h [moved from include/asm-m68k/fcntl.h with 100% similarity]
arch/m68k/include/asm/flat.h [moved from arch/m68knommu/include/asm/flat.h with 100% similarity]
arch/m68k/include/asm/floppy.h [moved from include/asm-m68k/floppy.h with 100% similarity]
arch/m68k/include/asm/fpu.h [new file with mode: 0644]
arch/m68k/include/asm/fpu_mm.h [moved from include/asm-m68k/fpu.h with 100% similarity]
arch/m68k/include/asm/fpu_no.h [moved from arch/m68knommu/include/asm/fpu.h with 100% similarity]
arch/m68k/include/asm/futex.h [moved from include/asm-m68k/futex.h with 100% similarity]
arch/m68k/include/asm/hardirq.h [new file with mode: 0644]
arch/m68k/include/asm/hardirq_mm.h [moved from include/asm-m68k/hardirq.h with 100% similarity]
arch/m68k/include/asm/hardirq_no.h [moved from arch/m68knommu/include/asm/hardirq.h with 100% similarity]
arch/m68k/include/asm/hp300hw.h [moved from include/asm-m68k/hp300hw.h with 100% similarity]
arch/m68k/include/asm/hw_irq.h [new file with mode: 0644]
arch/m68k/include/asm/hw_irq_mm.h [moved from include/asm-m68k/hw_irq.h with 100% similarity]
arch/m68k/include/asm/hw_irq_no.h [moved from arch/m68knommu/include/asm/hw_irq.h with 100% similarity]
arch/m68k/include/asm/hwtest.h [moved from include/asm-m68k/hwtest.h with 100% similarity]
arch/m68k/include/asm/ide.h [moved from include/asm-m68k/ide.h with 100% similarity]
arch/m68k/include/asm/idprom.h [moved from include/asm-m68k/idprom.h with 100% similarity]
arch/m68k/include/asm/intersil.h [moved from include/asm-m68k/intersil.h with 100% similarity]
arch/m68k/include/asm/io.h [new file with mode: 0644]
arch/m68k/include/asm/io_mm.h [moved from include/asm-m68k/io.h with 100% similarity]
arch/m68k/include/asm/io_no.h [moved from arch/m68knommu/include/asm/io.h with 100% similarity]
arch/m68k/include/asm/ioctl.h [moved from include/asm-m68k/ioctl.h with 100% similarity]
arch/m68k/include/asm/ioctls.h [moved from include/asm-m68k/ioctls.h with 100% similarity]
arch/m68k/include/asm/ipcbuf.h [moved from include/asm-m68k/ipcbuf.h with 100% similarity]
arch/m68k/include/asm/irq.h [new file with mode: 0644]
arch/m68k/include/asm/irq_mm.h [moved from include/asm-m68k/irq.h with 100% similarity]
arch/m68k/include/asm/irq_no.h [moved from arch/m68knommu/include/asm/irq.h with 100% similarity]
arch/m68k/include/asm/irq_regs.h [moved from include/asm-m68k/irq_regs.h with 100% similarity]
arch/m68k/include/asm/kdebug.h [moved from include/asm-m68k/kdebug.h with 100% similarity]
arch/m68k/include/asm/kmap_types.h [new file with mode: 0644]
arch/m68k/include/asm/kmap_types_mm.h [moved from include/asm-m68k/kmap_types.h with 100% similarity]
arch/m68k/include/asm/kmap_types_no.h [moved from arch/m68knommu/include/asm/kmap_types.h with 100% similarity]
arch/m68k/include/asm/linkage.h [moved from include/asm-m68k/linkage.h with 100% similarity]
arch/m68k/include/asm/local.h [moved from include/asm-m68k/local.h with 100% similarity]
arch/m68k/include/asm/m5206sim.h [moved from arch/m68knommu/include/asm/m5206sim.h with 100% similarity]
arch/m68k/include/asm/m520xsim.h [moved from arch/m68knommu/include/asm/m520xsim.h with 100% similarity]
arch/m68k/include/asm/m523xsim.h [moved from arch/m68knommu/include/asm/m523xsim.h with 100% similarity]
arch/m68k/include/asm/m5249sim.h [moved from arch/m68knommu/include/asm/m5249sim.h with 100% similarity]
arch/m68k/include/asm/m5272sim.h [moved from arch/m68knommu/include/asm/m5272sim.h with 100% similarity]
arch/m68k/include/asm/m527xsim.h [moved from arch/m68knommu/include/asm/m527xsim.h with 100% similarity]
arch/m68k/include/asm/m528xsim.h [moved from arch/m68knommu/include/asm/m528xsim.h with 100% similarity]
arch/m68k/include/asm/m5307sim.h [moved from arch/m68knommu/include/asm/m5307sim.h with 100% similarity]
arch/m68k/include/asm/m532xsim.h [moved from arch/m68knommu/include/asm/m532xsim.h with 100% similarity]
arch/m68k/include/asm/m5407sim.h [moved from arch/m68knommu/include/asm/m5407sim.h with 100% similarity]
arch/m68k/include/asm/m68360.h [moved from arch/m68knommu/include/asm/m68360.h with 100% similarity]
arch/m68k/include/asm/m68360_enet.h [moved from arch/m68knommu/include/asm/m68360_enet.h with 100% similarity]
arch/m68k/include/asm/m68360_pram.h [moved from arch/m68knommu/include/asm/m68360_pram.h with 100% similarity]
arch/m68k/include/asm/m68360_quicc.h [moved from arch/m68knommu/include/asm/m68360_quicc.h with 100% similarity]
arch/m68k/include/asm/m68360_regs.h [moved from arch/m68knommu/include/asm/m68360_regs.h with 100% similarity]
arch/m68k/include/asm/mac_asc.h [moved from include/asm-m68k/mac_asc.h with 100% similarity]
arch/m68k/include/asm/mac_baboon.h [moved from include/asm-m68k/mac_baboon.h with 100% similarity]
arch/m68k/include/asm/mac_iop.h [moved from include/asm-m68k/mac_iop.h with 100% similarity]
arch/m68k/include/asm/mac_mouse.h [moved from include/asm-m68k/mac_mouse.h with 100% similarity]
arch/m68k/include/asm/mac_oss.h [moved from include/asm-m68k/mac_oss.h with 100% similarity]
arch/m68k/include/asm/mac_psc.h [moved from include/asm-m68k/mac_psc.h with 100% similarity]
arch/m68k/include/asm/mac_via.h [moved from include/asm-m68k/mac_via.h with 100% similarity]
arch/m68k/include/asm/machdep.h [new file with mode: 0644]
arch/m68k/include/asm/machdep_mm.h [moved from include/asm-m68k/machdep.h with 100% similarity]
arch/m68k/include/asm/machdep_no.h [moved from arch/m68knommu/include/asm/machdep.h with 100% similarity]
arch/m68k/include/asm/machines.h [moved from include/asm-m68k/machines.h with 100% similarity]
arch/m68k/include/asm/machw.h [moved from include/asm-m68k/machw.h with 100% similarity]
arch/m68k/include/asm/macintosh.h [moved from include/asm-m68k/macintosh.h with 100% similarity]
arch/m68k/include/asm/macints.h [moved from include/asm-m68k/macints.h with 100% similarity]
arch/m68k/include/asm/math-emu.h [moved from include/asm-m68k/math-emu.h with 100% similarity]
arch/m68k/include/asm/mc146818rtc.h [new file with mode: 0644]
arch/m68k/include/asm/mc146818rtc_mm.h [moved from include/asm-m68k/mc146818rtc.h with 100% similarity]
arch/m68k/include/asm/mc146818rtc_no.h [moved from arch/m68knommu/include/asm/mc146818rtc.h with 100% similarity]
arch/m68k/include/asm/mcfcache.h [moved from arch/m68knommu/include/asm/mcfcache.h with 100% similarity]
arch/m68k/include/asm/mcfdma.h [moved from arch/m68knommu/include/asm/mcfdma.h with 100% similarity]
arch/m68k/include/asm/mcfmbus.h [moved from arch/m68knommu/include/asm/mcfmbus.h with 100% similarity]
arch/m68k/include/asm/mcfne.h [moved from arch/m68knommu/include/asm/mcfne.h with 100% similarity]
arch/m68k/include/asm/mcfpci.h [moved from arch/m68knommu/include/asm/mcfpci.h with 100% similarity]
arch/m68k/include/asm/mcfpit.h [moved from arch/m68knommu/include/asm/mcfpit.h with 100% similarity]
arch/m68k/include/asm/mcfsim.h [moved from arch/m68knommu/include/asm/mcfsim.h with 100% similarity]
arch/m68k/include/asm/mcfsmc.h [moved from arch/m68knommu/include/asm/mcfsmc.h with 100% similarity]
arch/m68k/include/asm/mcftimer.h [moved from arch/m68knommu/include/asm/mcftimer.h with 100% similarity]
arch/m68k/include/asm/mcfuart.h [moved from arch/m68knommu/include/asm/mcfuart.h with 100% similarity]
arch/m68k/include/asm/mcfwdebug.h [moved from arch/m68knommu/include/asm/mcfwdebug.h with 100% similarity]
arch/m68k/include/asm/md.h [moved from include/asm-m68k/md.h with 100% similarity]
arch/m68k/include/asm/mman.h [moved from include/asm-m68k/mman.h with 100% similarity]
arch/m68k/include/asm/mmu.h [new file with mode: 0644]
arch/m68k/include/asm/mmu_context.h [new file with mode: 0644]
arch/m68k/include/asm/mmu_context_mm.h [moved from include/asm-m68k/mmu_context.h with 100% similarity]
arch/m68k/include/asm/mmu_context_no.h [moved from arch/m68knommu/include/asm/mmu_context.h with 100% similarity]
arch/m68k/include/asm/mmu_mm.h [moved from include/asm-m68k/mmu.h with 100% similarity]
arch/m68k/include/asm/mmu_no.h [moved from arch/m68knommu/include/asm/mmu.h with 100% similarity]
arch/m68k/include/asm/mmzone.h [moved from include/asm-m68k/mmzone.h with 100% similarity]
arch/m68k/include/asm/module.h [new file with mode: 0644]
arch/m68k/include/asm/module_mm.h [moved from include/asm-m68k/module.h with 100% similarity]
arch/m68k/include/asm/module_no.h [moved from arch/m68knommu/include/asm/module.h with 100% similarity]
arch/m68k/include/asm/motorola_pgalloc.h [moved from include/asm-m68k/motorola_pgalloc.h with 100% similarity]
arch/m68k/include/asm/motorola_pgtable.h [moved from include/asm-m68k/motorola_pgtable.h with 100% similarity]
arch/m68k/include/asm/movs.h [moved from include/asm-m68k/movs.h with 100% similarity]
arch/m68k/include/asm/msgbuf.h [moved from include/asm-m68k/msgbuf.h with 100% similarity]
arch/m68k/include/asm/mutex.h [moved from include/asm-m68k/mutex.h with 100% similarity]
arch/m68k/include/asm/mvme147hw.h [moved from include/asm-m68k/mvme147hw.h with 100% similarity]
arch/m68k/include/asm/mvme16xhw.h [moved from include/asm-m68k/mvme16xhw.h with 100% similarity]
arch/m68k/include/asm/nettel.h [moved from arch/m68knommu/include/asm/nettel.h with 100% similarity]
arch/m68k/include/asm/nubus.h [moved from include/asm-m68k/nubus.h with 100% similarity]
arch/m68k/include/asm/openprom.h [moved from include/asm-m68k/openprom.h with 100% similarity]
arch/m68k/include/asm/oplib.h [moved from include/asm-m68k/oplib.h with 100% similarity]
arch/m68k/include/asm/page.h [new file with mode: 0644]
arch/m68k/include/asm/page_mm.h [moved from include/asm-m68k/page.h with 100% similarity]
arch/m68k/include/asm/page_no.h [moved from arch/m68knommu/include/asm/page.h with 100% similarity]
arch/m68k/include/asm/page_offset.h [new file with mode: 0644]
arch/m68k/include/asm/page_offset_mm.h [moved from include/asm-m68k/page_offset.h with 100% similarity]
arch/m68k/include/asm/page_offset_no.h [moved from arch/m68knommu/include/asm/page_offset.h with 100% similarity]
arch/m68k/include/asm/param.h [new file with mode: 0644]
arch/m68k/include/asm/param_mm.h [moved from include/asm-m68k/param.h with 100% similarity]
arch/m68k/include/asm/param_no.h [moved from arch/m68knommu/include/asm/param.h with 100% similarity]
arch/m68k/include/asm/parport.h [moved from include/asm-m68k/parport.h with 100% similarity]
arch/m68k/include/asm/pci.h [new file with mode: 0644]
arch/m68k/include/asm/pci_mm.h [moved from include/asm-m68k/pci.h with 100% similarity]
arch/m68k/include/asm/pci_no.h [moved from arch/m68knommu/include/asm/pci.h with 96% similarity]
arch/m68k/include/asm/percpu.h [moved from include/asm-m68k/percpu.h with 100% similarity]
arch/m68k/include/asm/pgalloc.h [new file with mode: 0644]
arch/m68k/include/asm/pgalloc_mm.h [moved from include/asm-m68k/pgalloc.h with 100% similarity]
arch/m68k/include/asm/pgalloc_no.h [moved from arch/m68knommu/include/asm/pgalloc.h with 100% similarity]
arch/m68k/include/asm/pgtable.h [new file with mode: 0644]
arch/m68k/include/asm/pgtable_mm.h [moved from include/asm-m68k/pgtable.h with 100% similarity]
arch/m68k/include/asm/pgtable_no.h [moved from arch/m68knommu/include/asm/pgtable.h with 100% similarity]
arch/m68k/include/asm/poll.h [moved from include/asm-m68k/poll.h with 100% similarity]
arch/m68k/include/asm/posix_types.h [moved from include/asm-m68k/posix_types.h with 100% similarity]
arch/m68k/include/asm/processor.h [new file with mode: 0644]
arch/m68k/include/asm/processor_mm.h [moved from include/asm-m68k/processor.h with 100% similarity]
arch/m68k/include/asm/processor_no.h [moved from arch/m68knommu/include/asm/processor.h with 100% similarity]
arch/m68k/include/asm/ptrace.h [new file with mode: 0644]
arch/m68k/include/asm/ptrace_mm.h [moved from include/asm-m68k/ptrace.h with 100% similarity]
arch/m68k/include/asm/ptrace_no.h [moved from arch/m68knommu/include/asm/ptrace.h with 100% similarity]
arch/m68k/include/asm/q40_master.h [moved from include/asm-m68k/q40_master.h with 100% similarity]
arch/m68k/include/asm/q40ints.h [moved from include/asm-m68k/q40ints.h with 100% similarity]
arch/m68k/include/asm/quicc_simple.h [moved from arch/m68knommu/include/asm/quicc_simple.h with 100% similarity]
arch/m68k/include/asm/raw_io.h [moved from include/asm-m68k/raw_io.h with 100% similarity]
arch/m68k/include/asm/resource.h [moved from include/asm-m68k/resource.h with 100% similarity]
arch/m68k/include/asm/rtc.h [moved from include/asm-m68k/rtc.h with 100% similarity]
arch/m68k/include/asm/sbus.h [moved from include/asm-m68k/sbus.h with 100% similarity]
arch/m68k/include/asm/scatterlist.h [new file with mode: 0644]
arch/m68k/include/asm/scatterlist_mm.h [moved from include/asm-m68k/scatterlist.h with 100% similarity]
arch/m68k/include/asm/scatterlist_no.h [moved from arch/m68knommu/include/asm/scatterlist.h with 100% similarity]
arch/m68k/include/asm/sections.h [moved from include/asm-m68k/sections.h with 100% similarity]
arch/m68k/include/asm/segment.h [new file with mode: 0644]
arch/m68k/include/asm/segment_mm.h [moved from include/asm-m68k/segment.h with 100% similarity]
arch/m68k/include/asm/segment_no.h [moved from arch/m68knommu/include/asm/segment.h with 100% similarity]
arch/m68k/include/asm/sembuf.h [moved from include/asm-m68k/sembuf.h with 100% similarity]
arch/m68k/include/asm/serial.h [moved from include/asm-m68k/serial.h with 100% similarity]
arch/m68k/include/asm/setup.h [new file with mode: 0644]
arch/m68k/include/asm/setup_mm.h [moved from include/asm-m68k/setup.h with 100% similarity]
arch/m68k/include/asm/setup_no.h [moved from arch/m68knommu/include/asm/setup.h with 84% similarity]
arch/m68k/include/asm/shm.h [moved from include/asm-m68k/shm.h with 100% similarity]
arch/m68k/include/asm/shmbuf.h [moved from include/asm-m68k/shmbuf.h with 100% similarity]
arch/m68k/include/asm/shmparam.h [moved from include/asm-m68k/shmparam.h with 100% similarity]
arch/m68k/include/asm/sigcontext.h [new file with mode: 0644]
arch/m68k/include/asm/sigcontext_mm.h [moved from include/asm-m68k/sigcontext.h with 100% similarity]
arch/m68k/include/asm/sigcontext_no.h [moved from arch/m68knommu/include/asm/sigcontext.h with 100% similarity]
arch/m68k/include/asm/siginfo.h [new file with mode: 0644]
arch/m68k/include/asm/siginfo_mm.h [moved from include/asm-m68k/siginfo.h with 100% similarity]
arch/m68k/include/asm/siginfo_no.h [moved from arch/m68knommu/include/asm/siginfo.h with 100% similarity]
arch/m68k/include/asm/signal.h [new file with mode: 0644]
arch/m68k/include/asm/signal_mm.h [moved from include/asm-m68k/signal.h with 100% similarity]
arch/m68k/include/asm/signal_no.h [moved from arch/m68knommu/include/asm/signal.h with 100% similarity]
arch/m68k/include/asm/smp.h [moved from arch/m68knommu/include/asm/smp.h with 100% similarity]
arch/m68k/include/asm/socket.h [moved from include/asm-m68k/socket.h with 100% similarity]
arch/m68k/include/asm/sockios.h [moved from include/asm-m68k/sockios.h with 100% similarity]
arch/m68k/include/asm/spinlock.h [moved from include/asm-m68k/spinlock.h with 100% similarity]
arch/m68k/include/asm/stat.h [moved from include/asm-m68k/stat.h with 100% similarity]
arch/m68k/include/asm/statfs.h [moved from include/asm-m68k/statfs.h with 100% similarity]
arch/m68k/include/asm/string.h [new file with mode: 0644]
arch/m68k/include/asm/string_mm.h [moved from include/asm-m68k/string.h with 100% similarity]
arch/m68k/include/asm/string_no.h [moved from arch/m68knommu/include/asm/string.h with 100% similarity]
arch/m68k/include/asm/sun3-head.h [moved from include/asm-m68k/sun3-head.h with 100% similarity]
arch/m68k/include/asm/sun3_pgalloc.h [moved from include/asm-m68k/sun3_pgalloc.h with 100% similarity]
arch/m68k/include/asm/sun3_pgtable.h [moved from include/asm-m68k/sun3_pgtable.h with 100% similarity]
arch/m68k/include/asm/sun3ints.h [moved from include/asm-m68k/sun3ints.h with 100% similarity]
arch/m68k/include/asm/sun3mmu.h [moved from include/asm-m68k/sun3mmu.h with 100% similarity]
arch/m68k/include/asm/sun3x.h [moved from include/asm-m68k/sun3x.h with 100% similarity]
arch/m68k/include/asm/sun3xflop.h [moved from include/asm-m68k/sun3xflop.h with 100% similarity]
arch/m68k/include/asm/sun3xprom.h [moved from include/asm-m68k/sun3xprom.h with 100% similarity]
arch/m68k/include/asm/suspend.h [moved from include/asm-m68k/suspend.h with 100% similarity]
arch/m68k/include/asm/swab.h [new file with mode: 0644]
arch/m68k/include/asm/swab_mm.h [moved from include/asm-m68k/swab.h with 100% similarity]
arch/m68k/include/asm/swab_no.h [moved from arch/m68knommu/include/asm/swab.h with 100% similarity]
arch/m68k/include/asm/system.h [new file with mode: 0644]
arch/m68k/include/asm/system_mm.h [moved from include/asm-m68k/system.h with 100% similarity]
arch/m68k/include/asm/system_no.h [moved from arch/m68knommu/include/asm/system.h with 100% similarity]
arch/m68k/include/asm/termbits.h [moved from include/asm-m68k/termbits.h with 100% similarity]
arch/m68k/include/asm/termios.h [moved from include/asm-m68k/termios.h with 100% similarity]
arch/m68k/include/asm/thread_info.h [new file with mode: 0644]
arch/m68k/include/asm/thread_info_mm.h [moved from include/asm-m68k/thread_info.h with 100% similarity]
arch/m68k/include/asm/thread_info_no.h [moved from arch/m68knommu/include/asm/thread_info.h with 100% similarity]
arch/m68k/include/asm/timex.h [new file with mode: 0644]
arch/m68k/include/asm/timex_mm.h [moved from include/asm-m68k/timex.h with 100% similarity]
arch/m68k/include/asm/timex_no.h [moved from arch/m68knommu/include/asm/timex.h with 100% similarity]
arch/m68k/include/asm/tlb.h [moved from include/asm-m68k/tlb.h with 100% similarity]
arch/m68k/include/asm/tlbflush.h [new file with mode: 0644]
arch/m68k/include/asm/tlbflush_mm.h [moved from include/asm-m68k/tlbflush.h with 100% similarity]
arch/m68k/include/asm/tlbflush_no.h [moved from arch/m68knommu/include/asm/tlbflush.h with 100% similarity]
arch/m68k/include/asm/topology.h [moved from include/asm-m68k/topology.h with 100% similarity]
arch/m68k/include/asm/traps.h [new file with mode: 0644]
arch/m68k/include/asm/traps_mm.h [moved from include/asm-m68k/traps.h with 100% similarity]
arch/m68k/include/asm/traps_no.h [moved from arch/m68knommu/include/asm/traps.h with 100% similarity]
arch/m68k/include/asm/types.h [moved from include/asm-m68k/types.h with 100% similarity]
arch/m68k/include/asm/uaccess.h [new file with mode: 0644]
arch/m68k/include/asm/uaccess_mm.h [moved from include/asm-m68k/uaccess.h with 100% similarity]
arch/m68k/include/asm/uaccess_no.h [moved from arch/m68knommu/include/asm/uaccess.h with 100% similarity]
arch/m68k/include/asm/ucontext.h [new file with mode: 0644]
arch/m68k/include/asm/ucontext_mm.h [moved from include/asm-m68k/ucontext.h with 100% similarity]
arch/m68k/include/asm/ucontext_no.h [moved from arch/m68knommu/include/asm/ucontext.h with 100% similarity]
arch/m68k/include/asm/unaligned.h [new file with mode: 0644]
arch/m68k/include/asm/unaligned_mm.h [moved from include/asm-m68k/unaligned.h with 100% similarity]
arch/m68k/include/asm/unaligned_no.h [moved from arch/m68knommu/include/asm/unaligned.h with 100% similarity]
arch/m68k/include/asm/unistd.h [new file with mode: 0644]
arch/m68k/include/asm/unistd_mm.h [moved from include/asm-m68k/unistd.h with 100% similarity]
arch/m68k/include/asm/unistd_no.h [moved from arch/m68knommu/include/asm/unistd.h with 100% similarity]
arch/m68k/include/asm/user.h [moved from include/asm-m68k/user.h with 100% similarity]
arch/m68k/include/asm/virtconvert.h [moved from include/asm-m68k/virtconvert.h with 100% similarity]
arch/m68k/include/asm/xor.h [moved from include/asm-m68k/xor.h with 100% similarity]
arch/m68k/include/asm/zorro.h [moved from include/asm-m68k/zorro.h with 100% similarity]
arch/m68knommu/include/asm/Kbuild [deleted file]
arch/m68knommu/include/asm/auxvec.h [deleted file]
arch/m68knommu/include/asm/cachectl.h [deleted file]
arch/m68knommu/include/asm/cputime.h [deleted file]
arch/m68knommu/include/asm/device.h [deleted file]
arch/m68knommu/include/asm/emergency-restart.h [deleted file]
arch/m68knommu/include/asm/errno.h [deleted file]
arch/m68knommu/include/asm/fcntl.h [deleted file]
arch/m68knommu/include/asm/futex.h [deleted file]
arch/m68knommu/include/asm/hwtest.h [deleted file]
arch/m68knommu/include/asm/ioctl.h [deleted file]
arch/m68knommu/include/asm/ioctls.h [deleted file]
arch/m68knommu/include/asm/ipcbuf.h [deleted file]
arch/m68knommu/include/asm/irq_regs.h [deleted file]
arch/m68knommu/include/asm/kdebug.h [deleted file]
arch/m68knommu/include/asm/linkage.h [deleted file]
arch/m68knommu/include/asm/local.h [deleted file]
arch/m68knommu/include/asm/math-emu.h [deleted file]
arch/m68knommu/include/asm/md.h [deleted file]
arch/m68knommu/include/asm/mman.h [deleted file]
arch/m68knommu/include/asm/movs.h [deleted file]
arch/m68knommu/include/asm/msgbuf.h [deleted file]
arch/m68knommu/include/asm/mutex.h [deleted file]
arch/m68knommu/include/asm/openprom.h [deleted file]
arch/m68knommu/include/asm/oplib.h [deleted file]
arch/m68knommu/include/asm/percpu.h [deleted file]
arch/m68knommu/include/asm/poll.h [deleted file]
arch/m68knommu/include/asm/posix_types.h [deleted file]
arch/m68knommu/include/asm/resource.h [deleted file]
arch/m68knommu/include/asm/rtc.h [deleted file]
arch/m68knommu/include/asm/sections.h [deleted file]
arch/m68knommu/include/asm/sembuf.h [deleted file]
arch/m68knommu/include/asm/shm.h [deleted file]
arch/m68knommu/include/asm/shmbuf.h [deleted file]
arch/m68knommu/include/asm/shmparam.h [deleted file]
arch/m68knommu/include/asm/socket.h [deleted file]
arch/m68knommu/include/asm/sockios.h [deleted file]
arch/m68knommu/include/asm/spinlock.h [deleted file]
arch/m68knommu/include/asm/stat.h [deleted file]
arch/m68knommu/include/asm/statfs.h [deleted file]
arch/m68knommu/include/asm/termbits.h [deleted file]
arch/m68knommu/include/asm/termios.h [deleted file]
arch/m68knommu/include/asm/tlb.h [deleted file]
arch/m68knommu/include/asm/topology.h [deleted file]
arch/m68knommu/include/asm/types.h [deleted file]
arch/m68knommu/include/asm/user.h [deleted file]