49148020 - m68k,m68knommu: merge header files

Fri, 16 Jan 2009 11:58:10 +0000

m68k,m68knommu: merge header filesMerge header files for m68k and m68knommu to the single location: arch/m68k/include/asmThe majority of this patch was the result of thescript that is included in the changelog below.The script was originally written by Arnd Bergman andexten by me to cover a few more files.When the header files differed the script uses the following:The original m68k file is named _mm.h [mm for memory manager]The m68knommu file is named _no.h [no for no memory manager]The files uses the following include guard:This include gaurd works as the m68knommu toolchain setthe __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 actuallyidentify these and thus to fix them.The commit has been build tested with both a m68k anda 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/asmSOURCE=arch/m68knommu/include/asmINCLUDE="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.hcat << EOF > ${TARGET}/$1EOF git add ${TARGET}/$1}set -emkdir -p ${TARGET}git mv include/asm-m68k/* ${TARGET}rmdir include/asm-m68kgit rm ${SOURCE}/Kbuildfor F in $INCLUDE $EQUAL; do git rm ${SOURCE}/$Fdonefor F in $NOMUUFILES; do git mv ${SOURCE}/$F ${TARGET}/$Fdonefor F in $FILES ; do mergefile $Fdonermdir arch/m68knommu/include/asmrmdir arch/m68knommu/includeCc: Arnd Bergmann Cc: Geert Uytterhoeven Signed-off-by: Sam Ravnborg Signed-off-by: Greg Ungerer List of files: /linux-6.15/arch/m68k/include/asm/sun3ints.h

Changes in sun3ints.h

49148020 - m68k,m68knommu: merge header files