tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

byteorder: make swab.h include asm/swab.h like a regular header

Add swab.h to kbuild.asm and remove the individual entries from
each arch, mark as unifdef as some arches have some kernel-only
bits inside.

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Harvey Harrison and committed by
Linus Torvalds 74d96f01 aa0effbd

+2 -49
-1
arch/alpha/include/asm/Kbuild
··· 9 9 unifdef-y += fpu.h 10 10 unifdef-y += sysinfo.h 11 11 unifdef-y += compiler.h 12 - unifdef-y += swab.h
-1
arch/alpha/include/asm/byteorder.h
··· 1 1 #ifndef _ALPHA_BYTEORDER_H 2 2 #define _ALPHA_BYTEORDER_H 3 3 4 - #include <asm/swab.h> 5 4 #include <linux/byteorder/little_endian.h> 6 5 7 6 #endif /* _ALPHA_BYTEORDER_H */
-1
arch/arm/include/asm/Kbuild
··· 1 1 include include/asm-generic/Kbuild.asm 2 2 3 3 unifdef-y += hwcap.h 4 - unifdef-y += swab.h
-2
arch/arm/include/asm/byteorder.h
··· 15 15 #ifndef __ASM_ARM_BYTEORDER_H 16 16 #define __ASM_ARM_BYTEORDER_H 17 17 18 - #include <asm/swab.h> 19 - 20 18 #ifdef __ARMEB__ 21 19 #include <linux/byteorder/big_endian.h> 22 20 #else
-1
arch/avr32/include/asm/Kbuild
··· 1 1 include include/asm-generic/Kbuild.asm 2 2 3 - header-y += swab.h 4 3 header-y += cachectl.h
-1
arch/avr32/include/asm/byteorder.h
··· 4 4 #ifndef __ASM_AVR32_BYTEORDER_H 5 5 #define __ASM_AVR32_BYTEORDER_H 6 6 7 - #include <asm/swab.h> 8 7 #include <linux/byteorder/big_endian.h> 9 8 10 9 #endif /* __ASM_AVR32_BYTEORDER_H */
-1
arch/blackfin/include/asm/Kbuild
··· 1 1 include include/asm-generic/Kbuild.asm 2 2 3 3 unifdef-y += fixed_code.h 4 - unifdef-y += swab.h
-1
arch/blackfin/include/asm/byteorder.h
··· 1 1 #ifndef _BLACKFIN_BYTEORDER_H 2 2 #define _BLACKFIN_BYTEORDER_H 3 3 4 - #include <asm/swab.h> 5 4 #include <linux/byteorder/little_endian.h> 6 5 7 6 #endif /* _BLACKFIN_BYTEORDER_H */
-1
arch/cris/include/asm/Kbuild
··· 9 9 10 10 unifdef-y += etraxgpio.h 11 11 unifdef-y += rs485.h 12 - unifdef-y += swab.h
-1
arch/cris/include/asm/byteorder.h
··· 1 1 #ifndef _CRIS_BYTEORDER_H 2 2 #define _CRIS_BYTEORDER_H 3 3 4 - #include <asm/swab.h> 5 4 #include <linux/byteorder/little_endian.h> 6 5 7 6 #endif
-1
arch/h8300/include/asm/Kbuild
··· 1 1 include include/asm-generic/Kbuild.asm 2 - unifdef-y += swab.h
-1
arch/h8300/include/asm/byteorder.h
··· 1 1 #ifndef _H8300_BYTEORDER_H 2 2 #define _H8300_BYTEORDER_H 3 3 4 - #include <asm/swab.h> 5 4 #include <linux/byteorder/big_endian.h> 6 5 7 6 #endif /* _H8300_BYTEORDER_H */
-1
arch/ia64/include/asm/Kbuild
··· 14 14 unifdef-y += intrinsics.h 15 15 unifdef-y += perfmon.h 16 16 unifdef-y += ustack.h 17 - unifdef-y += swab.h
-1
arch/ia64/include/asm/byteorder.h
··· 1 1 #ifndef _ASM_IA64_BYTEORDER_H 2 2 #define _ASM_IA64_BYTEORDER_H 3 3 4 - #include <asm/swab.h> 5 4 #include <linux/byteorder/little_endian.h> 6 5 7 6 #endif /* _ASM_IA64_BYTEORDER_H */
-2
arch/m68knommu/include/asm/Kbuild
··· 1 1 include include/asm-generic/Kbuild.asm 2 - 3 - unifdef-y += swab.h
-1
arch/m68knommu/include/asm/byteorder.h
··· 1 1 #ifndef _M68KNOMMU_BYTEORDER_H 2 2 #define _M68KNOMMU_BYTEORDER_H 3 3 4 - #include <asm/swab.h> 5 4 #include <linux/byteorder/big_endian.h> 6 5 7 6 #endif /* _M68KNOMMU_BYTEORDER_H */
-1
arch/mips/include/asm/Kbuild
··· 1 1 include include/asm-generic/Kbuild.asm 2 2 3 3 header-y += cachectl.h sgidefs.h sysmips.h 4 - header-y += swab.h
-2
arch/mips/include/asm/byteorder.h
··· 8 8 #ifndef _ASM_BYTEORDER_H 9 9 #define _ASM_BYTEORDER_H 10 10 11 - #include <asm/swab.h> 12 - 13 11 #if defined(__MIPSEB__) 14 12 #include <linux/byteorder/big_endian.h> 15 13 #elif defined(__MIPSEL__)
-1
arch/parisc/include/asm/Kbuild
··· 1 1 include include/asm-generic/Kbuild.asm 2 2 3 3 unifdef-y += pdc.h 4 - unifdef-y += swab.h
-1
arch/parisc/include/asm/byteorder.h
··· 1 1 #ifndef _PARISC_BYTEORDER_H 2 2 #define _PARISC_BYTEORDER_H 3 3 4 - #include <asm/swab.h> 5 4 #include <linux/byteorder/big_endian.h> 6 5 7 6 #endif /* _PARISC_BYTEORDER_H */
-1
arch/powerpc/include/asm/Kbuild
··· 35 35 unifdef-y += termios.h 36 36 unifdef-y += types.h 37 37 unifdef-y += unistd.h 38 - unifdef-y += swab.h
-2
arch/powerpc/include/asm/byteorder.h
··· 7 7 * as published by the Free Software Foundation; either version 8 8 * 2 of the License, or (at your option) any later version. 9 9 */ 10 - 11 - #include <asm/swab.h> 12 10 #include <linux/byteorder/big_endian.h> 13 11 14 12 #endif /* _ASM_POWERPC_BYTEORDER_H */
-1
arch/s390/include/asm/Kbuild
··· 13 13 unifdef-y += debug.h 14 14 unifdef-y += chpid.h 15 15 unifdef-y += schid.h 16 - unifdef-y += swab.h
-1
arch/s390/include/asm/byteorder.h
··· 1 1 #ifndef _S390_BYTEORDER_H 2 2 #define _S390_BYTEORDER_H 3 3 4 - #include <asm/swab.h> 5 4 #include <linux/byteorder/big_endian.h> 6 5 7 6 #endif /* _S390_BYTEORDER_H */
-1
arch/sh/include/asm/Kbuild
··· 6 6 unifdef-y += unistd_64.h 7 7 unifdef-y += posix_types_32.h 8 8 unifdef-y += posix_types_64.h 9 - unifdef-y += swab.h
-2
arch/sh/include/asm/byteorder.h
··· 1 1 #ifndef __ASM_SH_BYTEORDER_H 2 2 #define __ASM_SH_BYTEORDER_H 3 3 4 - #include <asm/swab.h> 5 - 6 4 #ifdef __LITTLE_ENDIAN__ 7 5 #include <linux/byteorder/little_endian.h> 8 6 #else
-1
arch/sparc/include/asm/Kbuild
··· 17 17 header-y += uctx.h 18 18 header-y += utrap.h 19 19 header-y += watchdog.h 20 - header-y += swab.h
-1
arch/sparc/include/asm/byteorder.h
··· 1 1 #ifndef _SPARC_BYTEORDER_H 2 2 #define _SPARC_BYTEORDER_H 3 3 4 - #include <asm/swab.h> 5 4 #include <linux/byteorder/big_endian.h> 6 5 7 6 #endif /* _SPARC_BYTEORDER_H */
-1
arch/x86/include/asm/Kbuild
··· 22 22 unifdef-y += unistd_64.h 23 23 unifdef-y += vm86.h 24 24 unifdef-y += vsyscall.h 25 - unifdef-y += swab.h
-1
arch/x86/include/asm/byteorder.h
··· 1 1 #ifndef _ASM_X86_BYTEORDER_H 2 2 #define _ASM_X86_BYTEORDER_H 3 3 4 - #include <asm/swab.h> 5 4 #include <linux/byteorder/little_endian.h> 6 5 7 6 #endif /* _ASM_X86_BYTEORDER_H */
-2
arch/xtensa/include/asm/Kbuild
··· 1 1 include include/asm-generic/Kbuild.asm 2 - 3 - unifdef-y += swab.h
-2
arch/xtensa/include/asm/byteorder.h
··· 1 1 #ifndef _XTENSA_BYTEORDER_H 2 2 #define _XTENSA_BYTEORDER_H 3 3 4 - #include <asm/swab.h> 5 - 6 4 #ifdef __XTENSA_EL__ 7 5 #include <linux/byteorder/little_endian.h> 8 6 #elif defined(__XTENSA_EB__)
-1
include/asm-frv/Kbuild
··· 3 3 header-y += registers.h 4 4 5 5 unifdef-y += termios.h 6 - unifdef-y += swab.h
-1
include/asm-frv/byteorder.h
··· 1 1 #ifndef _ASM_BYTEORDER_H 2 2 #define _ASM_BYTEORDER_H 3 3 4 - #include <asm/swab.h> 5 4 #include <linux/byteorder/big_endian.h> 6 5 7 6 #endif /* _ASM_BYTEORDER_H */
+1
include/asm-generic/Kbuild.asm
··· 31 31 unifdef-y += sockios.h 32 32 unifdef-y += stat.h 33 33 unifdef-y += statfs.h 34 + unifdef-y += swab.h 34 35 unifdef-y += termbits.h 35 36 unifdef-y += termios.h 36 37 unifdef-y += types.h
-1
include/asm-m32r/Kbuild
··· 1 1 include include/asm-generic/Kbuild.asm 2 - unifdef-y += swab.h
-2
include/asm-m32r/byteorder.h
··· 1 1 #ifndef _ASM_M32R_BYTEORDER_H 2 2 #define _ASM_M32R_BYTEORDER_H 3 3 4 - #include <asm/swab.h> 5 - 6 4 #if defined(__LITTLE_ENDIAN__) 7 5 # include <linux/byteorder/little_endian.h> 8 6 #else
-1
include/asm-m68k/Kbuild
··· 1 1 include include/asm-generic/Kbuild.asm 2 2 header-y += cachectl.h 3 - unifdef-y += swab.h
-1
include/asm-m68k/byteorder.h
··· 1 1 #ifndef _M68K_BYTEORDER_H 2 2 #define _M68K_BYTEORDER_H 3 3 4 - #include <asm/swab.h> 5 4 #include <linux/byteorder/big_endian.h> 6 5 7 6 #endif /* _M68K_BYTEORDER_H */
-1
include/asm-mn10300/Kbuild
··· 1 1 include include/asm-generic/Kbuild.asm 2 - unifdef-y += swab.h
-1
include/asm-mn10300/byteorder.h
··· 1 1 #ifndef _ASM_BYTEORDER_H 2 2 #define _ASM_BYTEORDER_H 3 3 4 - #include <asm/swab.h> 5 4 #include <linux/byteorder/little_endian.h> 6 5 7 6 #endif /* _ASM_BYTEORDER_H */
+1 -1
include/linux/swab.h
··· 3 3 4 4 #include <linux/types.h> 5 5 #include <linux/compiler.h> 6 - #include <asm/byteorder.h> 6 + #include <asm/swab.h> 7 7 8 8 /* 9 9 * casts are necessary for constants, because we never know how for sure