sparc: join the remaining header files
authorSam Ravnborg <sam@ravnborg.org>
Fri, 18 Jul 2008 04:55:51 +0000 (21:55 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 18 Jul 2008 04:55:51 +0000 (21:55 -0700)
commitf5e706ad886b6a5eb59637830110b09ccebf01c5
treeea043a0a28e16a2ac6395c35d737f52698a165b7
parent5e3609f60c09f0f15f71f80c6d7933b2c7be71a6
sparc: join the remaining header files

With this commit all sparc64 header files are moved to asm-sparc.
The remaining files (71 files) were too different to be trivially
merged so divide them up in a _32.h and a _64.h file which
are both included from the file with no bit size.

The following script were used:
cd include
FILES=`wc -l asm-sparc64/*h | grep -v '^     1' | cut -b 20-`

for FILE in ${FILES}; do
  echo $FILE:
  BASE=`echo $FILE | cut -d '.' -f 1`
  FN32=${BASE}_32.h
  FN64=${BASE}_64.h
  GUARD=___ASM_SPARC_`echo $BASE | tr '-' '_' | tr [:lower:] [:upper:]`_H
  git mv asm-sparc/$FILE asm-sparc/$FN32
  git mv asm-sparc64/$FILE asm-sparc/$FN64
  echo git mv done
  printf "#ifndef %s\n" $GUARD                             >   asm-sparc/$FILE
  printf "#define %s\n" $GUARD                             >>  asm-sparc/$FILE
  printf "#if defined(__sparc__) && defined(__arch64__)\n" >>  asm-sparc/$FILE
  printf "#include <asm-sparc/%s>\n" $FN64                 >>  asm-sparc/$FILE
  printf "#else\n"                                         >>  asm-sparc/$FILE
  printf "#include <asm-sparc/%s>\n" $FN32                 >>  asm-sparc/$FILE
  printf "#endif\n"                                        >>  asm-sparc/$FILE
  printf "#endif\n"                                        >>  asm-sparc/$FILE
  git add asm-sparc/$FILE
  echo new file done
  printf "#include <asm-sparc/%s>\n" $FILE                 >  asm-sparc64/$FILE
  git add asm-sparc64/$FILE
  echo sparc64 file done
done

The guard contains three '_' to avoid conflict with existing guards.
In additing the two Kbuild files are emptied to avoid breaking
headers_* targets.
We will reintroduce the exported header files when the necessary
kbuild changes are merged.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
254 files changed:
include/asm-sparc/Kbuild
include/asm-sparc/atomic.h
include/asm-sparc/atomic_32.h [new file with mode: 0644]
include/asm-sparc/atomic_64.h [new file with mode: 0644]
include/asm-sparc/auxio.h
include/asm-sparc/auxio_32.h [new file with mode: 0644]
include/asm-sparc/auxio_64.h [new file with mode: 0644]
include/asm-sparc/bitops.h
include/asm-sparc/bitops_32.h [new file with mode: 0644]
include/asm-sparc/bitops_64.h [new file with mode: 0644]
include/asm-sparc/cacheflush.h
include/asm-sparc/cacheflush_32.h [new file with mode: 0644]
include/asm-sparc/cacheflush_64.h [new file with mode: 0644]
include/asm-sparc/checksum.h
include/asm-sparc/checksum_32.h [new file with mode: 0644]
include/asm-sparc/checksum_64.h [new file with mode: 0644]
include/asm-sparc/cpudata.h
include/asm-sparc/cpudata_32.h [new file with mode: 0644]
include/asm-sparc/cpudata_64.h [new file with mode: 0644]
include/asm-sparc/delay.h
include/asm-sparc/delay_32.h [new file with mode: 0644]
include/asm-sparc/delay_64.h [new file with mode: 0644]
include/asm-sparc/dma-mapping.h
include/asm-sparc/dma-mapping_32.h [new file with mode: 0644]
include/asm-sparc/dma-mapping_64.h [new file with mode: 0644]
include/asm-sparc/dma.h
include/asm-sparc/dma_32.h [new file with mode: 0644]
include/asm-sparc/dma_64.h [new file with mode: 0644]
include/asm-sparc/ebus.h
include/asm-sparc/ebus_32.h [new file with mode: 0644]
include/asm-sparc/ebus_64.h [new file with mode: 0644]
include/asm-sparc/elf.h
include/asm-sparc/elf_32.h [new file with mode: 0644]
include/asm-sparc/elf_64.h [new file with mode: 0644]
include/asm-sparc/floppy.h
include/asm-sparc/floppy_32.h [new file with mode: 0644]
include/asm-sparc/floppy_64.h [new file with mode: 0644]
include/asm-sparc/futex.h
include/asm-sparc/futex_32.h [new file with mode: 0644]
include/asm-sparc/futex_64.h [new file with mode: 0644]
include/asm-sparc/hardirq.h
include/asm-sparc/hardirq_32.h [new file with mode: 0644]
include/asm-sparc/hardirq_64.h [new file with mode: 0644]
include/asm-sparc/head.h
include/asm-sparc/head_32.h [new file with mode: 0644]
include/asm-sparc/head_64.h [new file with mode: 0644]
include/asm-sparc/ide.h
include/asm-sparc/ide_32.h [new file with mode: 0644]
include/asm-sparc/ide_64.h [new file with mode: 0644]
include/asm-sparc/io.h
include/asm-sparc/io_32.h [new file with mode: 0644]
include/asm-sparc/io_64.h [new file with mode: 0644]
include/asm-sparc/iommu.h
include/asm-sparc/iommu_32.h [new file with mode: 0644]
include/asm-sparc/iommu_64.h [new file with mode: 0644]
include/asm-sparc/ipcbuf.h
include/asm-sparc/ipcbuf_32.h [new file with mode: 0644]
include/asm-sparc/ipcbuf_64.h [new file with mode: 0644]
include/asm-sparc/irq.h
include/asm-sparc/irq_32.h [new file with mode: 0644]
include/asm-sparc/irq_64.h [new file with mode: 0644]
include/asm-sparc/irqflags.h
include/asm-sparc/irqflags_32.h [new file with mode: 0644]
include/asm-sparc/irqflags_64.h [new file with mode: 0644]
include/asm-sparc/kdebug.h
include/asm-sparc/kdebug_32.h [new file with mode: 0644]
include/asm-sparc/kdebug_64.h [new file with mode: 0644]
include/asm-sparc/mc146818rtc.h
include/asm-sparc/mc146818rtc_32.h [new file with mode: 0644]
include/asm-sparc/mc146818rtc_64.h [new file with mode: 0644]
include/asm-sparc/mmu.h
include/asm-sparc/mmu_32.h [new file with mode: 0644]
include/asm-sparc/mmu_64.h [new file with mode: 0644]
include/asm-sparc/mmu_context.h
include/asm-sparc/mmu_context_32.h [new file with mode: 0644]
include/asm-sparc/mmu_context_64.h [new file with mode: 0644]
include/asm-sparc/module.h
include/asm-sparc/module_32.h [new file with mode: 0644]
include/asm-sparc/module_64.h [new file with mode: 0644]
include/asm-sparc/mostek.h
include/asm-sparc/mostek_32.h [new file with mode: 0644]
include/asm-sparc/mostek_64.h [new file with mode: 0644]
include/asm-sparc/namei.h
include/asm-sparc/namei_32.h [new file with mode: 0644]
include/asm-sparc/namei_64.h [new file with mode: 0644]
include/asm-sparc/of_platform.h
include/asm-sparc/of_platform_32.h [new file with mode: 0644]
include/asm-sparc/of_platform_64.h [new file with mode: 0644]
include/asm-sparc/openprom.h
include/asm-sparc/openprom_32.h [new file with mode: 0644]
include/asm-sparc/openprom_64.h [new file with mode: 0644]
include/asm-sparc/oplib.h
include/asm-sparc/oplib_32.h [new file with mode: 0644]
include/asm-sparc/oplib_64.h [new file with mode: 0644]
include/asm-sparc/page.h
include/asm-sparc/page_32.h [new file with mode: 0644]
include/asm-sparc/page_64.h [new file with mode: 0644]
include/asm-sparc/pci.h
include/asm-sparc/pci_32.h [new file with mode: 0644]
include/asm-sparc/pci_64.h [new file with mode: 0644]
include/asm-sparc/percpu.h
include/asm-sparc/percpu_32.h [new file with mode: 0644]
include/asm-sparc/percpu_64.h [new file with mode: 0644]
include/asm-sparc/pgalloc.h
include/asm-sparc/pgalloc_32.h [new file with mode: 0644]
include/asm-sparc/pgalloc_64.h [new file with mode: 0644]
include/asm-sparc/pgtable.h
include/asm-sparc/pgtable_32.h [new file with mode: 0644]
include/asm-sparc/pgtable_64.h [new file with mode: 0644]
include/asm-sparc/posix_types.h
include/asm-sparc/posix_types_32.h [new file with mode: 0644]
include/asm-sparc/posix_types_64.h [new file with mode: 0644]
include/asm-sparc/processor.h
include/asm-sparc/processor_32.h [new file with mode: 0644]
include/asm-sparc/processor_64.h [new file with mode: 0644]
include/asm-sparc/ptrace.h
include/asm-sparc/ptrace_32.h [new file with mode: 0644]
include/asm-sparc/ptrace_64.h [new file with mode: 0644]
include/asm-sparc/reg.h
include/asm-sparc/reg_32.h [new file with mode: 0644]
include/asm-sparc/reg_64.h [new file with mode: 0644]
include/asm-sparc/sbus.h
include/asm-sparc/sbus_32.h [new file with mode: 0644]
include/asm-sparc/sbus_64.h [new file with mode: 0644]
include/asm-sparc/scatterlist.h
include/asm-sparc/scatterlist_32.h [new file with mode: 0644]
include/asm-sparc/scatterlist_64.h [new file with mode: 0644]
include/asm-sparc/sections.h
include/asm-sparc/sections_32.h [new file with mode: 0644]
include/asm-sparc/sections_64.h [new file with mode: 0644]
include/asm-sparc/sfp-machine.h
include/asm-sparc/sfp-machine_32.h [new file with mode: 0644]
include/asm-sparc/sfp-machine_64.h [new file with mode: 0644]
include/asm-sparc/shmparam.h
include/asm-sparc/shmparam_32.h [new file with mode: 0644]
include/asm-sparc/shmparam_64.h [new file with mode: 0644]
include/asm-sparc/sigcontext.h
include/asm-sparc/sigcontext_32.h [new file with mode: 0644]
include/asm-sparc/sigcontext_64.h [new file with mode: 0644]
include/asm-sparc/siginfo.h
include/asm-sparc/siginfo_32.h [new file with mode: 0644]
include/asm-sparc/siginfo_64.h [new file with mode: 0644]
include/asm-sparc/signal.h
include/asm-sparc/signal_32.h [new file with mode: 0644]
include/asm-sparc/signal_64.h [new file with mode: 0644]
include/asm-sparc/smp.h
include/asm-sparc/smp_32.h [new file with mode: 0644]
include/asm-sparc/smp_64.h [new file with mode: 0644]
include/asm-sparc/spinlock.h
include/asm-sparc/spinlock_32.h [new file with mode: 0644]
include/asm-sparc/spinlock_64.h [new file with mode: 0644]
include/asm-sparc/stat.h
include/asm-sparc/stat_32.h [new file with mode: 0644]
include/asm-sparc/stat_64.h [new file with mode: 0644]
include/asm-sparc/statfs.h
include/asm-sparc/statfs_32.h [new file with mode: 0644]
include/asm-sparc/statfs_64.h [new file with mode: 0644]
include/asm-sparc/string.h
include/asm-sparc/string_32.h [new file with mode: 0644]
include/asm-sparc/string_64.h [new file with mode: 0644]
include/asm-sparc/system.h
include/asm-sparc/system_32.h [new file with mode: 0644]
include/asm-sparc/system_64.h [new file with mode: 0644]
include/asm-sparc/thread_info.h
include/asm-sparc/thread_info_32.h [new file with mode: 0644]
include/asm-sparc/thread_info_64.h [new file with mode: 0644]
include/asm-sparc/timer.h
include/asm-sparc/timer_32.h [new file with mode: 0644]
include/asm-sparc/timer_64.h [new file with mode: 0644]
include/asm-sparc/timex.h
include/asm-sparc/timex_32.h [new file with mode: 0644]
include/asm-sparc/timex_64.h [new file with mode: 0644]
include/asm-sparc/tlb.h
include/asm-sparc/tlb_32.h [new file with mode: 0644]
include/asm-sparc/tlb_64.h [new file with mode: 0644]
include/asm-sparc/tlbflush.h
include/asm-sparc/tlbflush_32.h [new file with mode: 0644]
include/asm-sparc/tlbflush_64.h [new file with mode: 0644]
include/asm-sparc/topology.h
include/asm-sparc/topology_32.h [new file with mode: 0644]
include/asm-sparc/topology_64.h [new file with mode: 0644]
include/asm-sparc/uaccess.h
include/asm-sparc/uaccess_32.h [new file with mode: 0644]
include/asm-sparc/uaccess_64.h [new file with mode: 0644]
include/asm-sparc/unistd.h
include/asm-sparc/unistd_32.h [new file with mode: 0644]
include/asm-sparc/unistd_64.h [new file with mode: 0644]
include/asm-sparc/xor.h
include/asm-sparc/xor_32.h [new file with mode: 0644]
include/asm-sparc/xor_64.h [new file with mode: 0644]
include/asm-sparc64/Kbuild
include/asm-sparc64/atomic.h
include/asm-sparc64/auxio.h
include/asm-sparc64/bitops.h
include/asm-sparc64/cacheflush.h
include/asm-sparc64/checksum.h
include/asm-sparc64/cpudata.h
include/asm-sparc64/delay.h
include/asm-sparc64/dma-mapping.h
include/asm-sparc64/dma.h
include/asm-sparc64/ebus.h
include/asm-sparc64/elf.h
include/asm-sparc64/floppy.h
include/asm-sparc64/futex.h
include/asm-sparc64/hardirq.h
include/asm-sparc64/head.h
include/asm-sparc64/ide.h
include/asm-sparc64/io.h
include/asm-sparc64/iommu.h
include/asm-sparc64/ipcbuf.h
include/asm-sparc64/irq.h
include/asm-sparc64/irqflags.h
include/asm-sparc64/kdebug.h
include/asm-sparc64/mc146818rtc.h
include/asm-sparc64/mmu.h
include/asm-sparc64/mmu_context.h
include/asm-sparc64/module.h
include/asm-sparc64/mostek.h
include/asm-sparc64/namei.h
include/asm-sparc64/of_platform.h
include/asm-sparc64/openprom.h
include/asm-sparc64/oplib.h
include/asm-sparc64/page.h
include/asm-sparc64/pci.h
include/asm-sparc64/percpu.h
include/asm-sparc64/pgalloc.h
include/asm-sparc64/pgtable.h
include/asm-sparc64/posix_types.h
include/asm-sparc64/processor.h
include/asm-sparc64/ptrace.h
include/asm-sparc64/reg.h
include/asm-sparc64/sbus.h
include/asm-sparc64/scatterlist.h
include/asm-sparc64/sections.h
include/asm-sparc64/sfp-machine.h
include/asm-sparc64/shmparam.h
include/asm-sparc64/sigcontext.h
include/asm-sparc64/siginfo.h
include/asm-sparc64/signal.h
include/asm-sparc64/smp.h
include/asm-sparc64/spinlock.h
include/asm-sparc64/stat.h
include/asm-sparc64/statfs.h
include/asm-sparc64/string.h
include/asm-sparc64/system.h
include/asm-sparc64/thread_info.h
include/asm-sparc64/timer.h
include/asm-sparc64/timex.h
include/asm-sparc64/tlb.h
include/asm-sparc64/tlbflush.h
include/asm-sparc64/topology.h
include/asm-sparc64/uaccess.h
include/asm-sparc64/unistd.h
include/asm-sparc64/xor.h