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>
Showing
- include/asm-sparc/Kbuild 1 addition, 22 deletionsinclude/asm-sparc/Kbuild
- include/asm-sparc/atomic.h 6 additions, 163 deletionsinclude/asm-sparc/atomic.h
- include/asm-sparc/atomic_32.h 165 additions, 0 deletionsinclude/asm-sparc/atomic_32.h
- include/asm-sparc/atomic_64.h 128 additions, 0 deletionsinclude/asm-sparc/atomic_64.h
- include/asm-sparc/auxio.h 8 additions, 89 deletionsinclude/asm-sparc/auxio.h
- include/asm-sparc/auxio_32.h 89 additions, 0 deletionsinclude/asm-sparc/auxio_32.h
- include/asm-sparc/auxio_64.h 100 additions, 0 deletionsinclude/asm-sparc/auxio_64.h
- include/asm-sparc/bitops.h 7 additions, 110 deletionsinclude/asm-sparc/bitops.h
- include/asm-sparc/bitops_32.h 111 additions, 0 deletionsinclude/asm-sparc/bitops_32.h
- include/asm-sparc/bitops_64.h 107 additions, 0 deletionsinclude/asm-sparc/bitops_64.h
- include/asm-sparc/cacheflush.h 8 additions, 85 deletionsinclude/asm-sparc/cacheflush.h
- include/asm-sparc/cacheflush_32.h 85 additions, 0 deletionsinclude/asm-sparc/cacheflush_32.h
- include/asm-sparc/cacheflush_64.h 76 additions, 0 deletionsinclude/asm-sparc/cacheflush_64.h
- include/asm-sparc/checksum.h 8 additions, 241 deletionsinclude/asm-sparc/checksum.h
- include/asm-sparc/checksum_32.h 241 additions, 0 deletionsinclude/asm-sparc/checksum_32.h
- include/asm-sparc/checksum_64.h 167 additions, 0 deletionsinclude/asm-sparc/checksum_64.h
- include/asm-sparc/cpudata.h 8 additions, 27 deletionsinclude/asm-sparc/cpudata.h
- include/asm-sparc/cpudata_32.h 27 additions, 0 deletionsinclude/asm-sparc/cpudata_32.h
- include/asm-sparc/cpudata_64.h 240 additions, 0 deletionsinclude/asm-sparc/cpudata_64.h
- include/asm-sparc/delay.h 8 additions, 34 deletionsinclude/asm-sparc/delay.h
Loading
Please register or sign in to comment