byteorder: make swab.h include asm/swab.h like a regular header
Subsystems (11)
PATCH 2/2 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 <[email protected]>
--- arch/alpha/include/asm/Kbuild | 1 - arch/alpha/include/asm/byteorder.h | 1 - arch/arm/include/asm/Kbuild | 1 - arch/arm/include/asm/byteorder.h | 2 -- arch/avr32/include/asm/Kbuild | 1 - arch/avr32/include/asm/byteorder.h | 1 - arch/blackfin/include/asm/Kbuild | 1 - arch/blackfin/include/asm/byteorder.h | 1 - arch/cris/include/asm/Kbuild | 1 - arch/cris/include/asm/byteorder.h | 1 - arch/h8300/include/asm/Kbuild | 1 - arch/h8300/include/asm/byteorder.h | 1 - arch/ia64/include/asm/Kbuild | 1 - arch/ia64/include/asm/byteorder.h | 1 - arch/m68knommu/include/asm/Kbuild | 2 -- arch/m68knommu/include/asm/byteorder.h | 1 - arch/mips/include/asm/Kbuild | 1 - arch/mips/include/asm/byteorder.h | 2 -- arch/parisc/include/asm/Kbuild | 1 - arch/parisc/include/asm/byteorder.h | 1 - arch/powerpc/include/asm/Kbuild | 1 - arch/powerpc/include/asm/byteorder.h | 2 -- arch/s390/include/asm/Kbuild | 1 - arch/s390/include/asm/byteorder.h | 1 - arch/sh/include/asm/Kbuild | 1 - arch/sh/include/asm/byteorder.h | 2 -- arch/sparc/include/asm/Kbuild | 1 - arch/sparc/include/asm/byteorder.h | 1 - arch/x86/include/asm/Kbuild | 1 - arch/x86/include/asm/byteorder.h | 1 - arch/xtensa/include/asm/Kbuild | 2 -- arch/xtensa/include/asm/byteorder.h | 2 -- include/asm-frv/Kbuild | 1 - include/asm-frv/byteorder.h | 1 - include/asm-generic/Kbuild.asm | 1 + include/asm-m32r/Kbuild | 1 - include/asm-m32r/byteorder.h | 2 -- include/asm-m68k/Kbuild | 1 - include/asm-m68k/byteorder.h | 1 - include/asm-mn10300/Kbuild | 1 - include/asm-mn10300/byteorder.h | 1 - include/linux/swab.h | 2 +- 42 files changed, 2 insertions(+), 49 deletions(-)
arch/alpha/include/asm/Kbuild +0 -1
@@ -9,4 +9,3 @@ unifdef-y += console.h unifdef-y += fpu.h unifdef-y += sysinfo.h unifdef-y += compiler.h -unifdef-y += swab.h
arch/alpha/include/asm/byteorder.h +0 -1
@@ -1,7 +1,6 @@#ifndef _ALPHA_BYTEORDER_H#define _ALPHA_BYTEORDER_H -#include <asm/swab.h> #include <linux/byteorder/little_endian.h> #endif /* _ALPHA_BYTEORDER_H */
arch/arm/include/asm/Kbuild +0 -1
@@ -1,4 +1,3 @@ include include/asm-generic/Kbuild.asm unifdef-y += hwcap.h -unifdef-y += swab.h
arch/arm/include/asm/byteorder.h +0 -2
@@ -15,8 +15,6 @@#ifndef __ASM_ARM_BYTEORDER_H#define __ASM_ARM_BYTEORDER_H -#include <asm/swab.h> -#ifdef __ARMEB__#include <linux/byteorder/big_endian.h> #else
arch/avr32/include/asm/Kbuild +0 -1
@@ -1,4 +1,3 @@ include include/asm-generic/Kbuild.asm -header-y += swab.h header-y += cachectl.h
arch/avr32/include/asm/byteorder.h +0 -1
@@ -4,7 +4,6 @@#ifndef __ASM_AVR32_BYTEORDER_H#define __ASM_AVR32_BYTEORDER_H -#include <asm/swab.h> #include <linux/byteorder/big_endian.h> #endif /* __ASM_AVR32_BYTEORDER_H */
arch/blackfin/include/asm/Kbuild +0 -1
@@ -1,4 +1,3 @@ include include/asm-generic/Kbuild.asm unifdef-y += fixed_code.h -unifdef-y += swab.h
arch/blackfin/include/asm/byteorder.h +0 -1
@@ -1,7 +1,6 @@#ifndef _BLACKFIN_BYTEORDER_H#define _BLACKFIN_BYTEORDER_H -#include <asm/swab.h> #include <linux/byteorder/little_endian.h> #endif /* _BLACKFIN_BYTEORDER_H */
arch/cris/include/asm/Kbuild +0 -1
@@ -9,4 +9,3 @@ header-y += sync_serial.h unifdef-y += etraxgpio.h unifdef-y += rs485.h -unifdef-y += swab.h
arch/cris/include/asm/byteorder.h +0 -1
@@ -1,7 +1,6 @@#ifndef _CRIS_BYTEORDER_H#define _CRIS_BYTEORDER_H -#include <asm/swab.h> #include <linux/byteorder/little_endian.h> #endif
arch/h8300/include/asm/Kbuild +0 -1
@@ -1,2 +1 @@ include include/asm-generic/Kbuild.asm -unifdef-y += swab.h
arch/h8300/include/asm/byteorder.h +0 -1
@@ -1,7 +1,6 @@#ifndef _H8300_BYTEORDER_H#define _H8300_BYTEORDER_H -#include <asm/swab.h> #include <linux/byteorder/big_endian.h> #endif /* _H8300_BYTEORDER_H */
arch/ia64/include/asm/Kbuild +0 -1
@@ -14,4 +14,3 @@ unifdef-y += gcc_intrin.h unifdef-y += intrinsics.h unifdef-y += perfmon.h unifdef-y += ustack.h -unifdef-y += swab.h
arch/ia64/include/asm/byteorder.h +0 -1
@@ -1,7 +1,6 @@#ifndef _ASM_IA64_BYTEORDER_H#define _ASM_IA64_BYTEORDER_H -#include <asm/swab.h> #include <linux/byteorder/little_endian.h> #endif /* _ASM_IA64_BYTEORDER_H */
arch/m68knommu/include/asm/Kbuild +0 -2
@@ -1,3 +1 @@ include include/asm-generic/Kbuild.asm - -unifdef-y += swab.h
arch/m68knommu/include/asm/byteorder.h +0 -1
@@ -1,7 +1,6 @@#ifndef _M68KNOMMU_BYTEORDER_H#define _M68KNOMMU_BYTEORDER_H -#include <asm/swab.h> #include <linux/byteorder/big_endian.h> #endif /* _M68KNOMMU_BYTEORDER_H */
arch/mips/include/asm/Kbuild +0 -1
@@ -1,4 +1,3 @@ include include/asm-generic/Kbuild.asm header-y += cachectl.h sgidefs.h sysmips.h -header-y += swab.h
arch/mips/include/asm/byteorder.h +0 -2
@@ -8,8 +8,6 @@#ifndef _ASM_BYTEORDER_H#define _ASM_BYTEORDER_H -#include <asm/swab.h> -#if defined(__MIPSEB__)#include <linux/byteorder/big_endian.h> #elif defined(__MIPSEL__)
arch/parisc/include/asm/Kbuild +0 -1
@@ -1,4 +1,3 @@ include include/asm-generic/Kbuild.asm unifdef-y += pdc.h -unifdef-y += swab.h
arch/parisc/include/asm/byteorder.h +0 -1
@@ -1,7 +1,6 @@#ifndef _PARISC_BYTEORDER_H#define _PARISC_BYTEORDER_H -#include <asm/swab.h> #include <linux/byteorder/big_endian.h> #endif /* _PARISC_BYTEORDER_H */
arch/powerpc/include/asm/Kbuild +0 -1
@@ -35,4 +35,3 @@ unifdef-y += spu_info.h unifdef-y += termios.h unifdef-y += types.h unifdef-y += unistd.h -unifdef-y += swab.h
arch/powerpc/include/asm/byteorder.h +0 -2
@@ -7,8 +7,6 @@* as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. */ - -#include <asm/swab.h> #include <linux/byteorder/big_endian.h> #endif /* _ASM_POWERPC_BYTEORDER_H */
arch/s390/include/asm/Kbuild +0 -1
@@ -13,4 +13,3 @@ unifdef-y += cmb.h unifdef-y += debug.h unifdef-y += chpid.h unifdef-y += schid.h -unifdef-y += swab.h
arch/s390/include/asm/byteorder.h +0 -1
@@ -1,7 +1,6 @@#ifndef _S390_BYTEORDER_H#define _S390_BYTEORDER_H -#include <asm/swab.h> #include <linux/byteorder/big_endian.h> #endif /* _S390_BYTEORDER_H */
arch/sh/include/asm/Kbuild +0 -1
@@ -6,4 +6,3 @@ unifdef-y += unistd_32.h unifdef-y += unistd_64.h unifdef-y += posix_types_32.h unifdef-y += posix_types_64.h -unifdef-y += swab.h
arch/sh/include/asm/byteorder.h +0 -2
@@ -1,8 +1,6 @@#ifndef __ASM_SH_BYTEORDER_H#define __ASM_SH_BYTEORDER_H -#include <asm/swab.h> -#ifdef __LITTLE_ENDIAN__#include <linux/byteorder/little_endian.h> #else
arch/sparc/include/asm/Kbuild +0 -1
@@ -17,4 +17,3 @@ header-y += traps.h header-y += uctx.h header-y += utrap.h header-y += watchdog.h -header-y += swab.h
arch/sparc/include/asm/byteorder.h +0 -1
@@ -1,7 +1,6 @@#ifndef _SPARC_BYTEORDER_H#define _SPARC_BYTEORDER_H -#include <asm/swab.h> #include <linux/byteorder/big_endian.h> #endif /* _SPARC_BYTEORDER_H */
arch/x86/include/asm/Kbuild +0 -1
@@ -22,4 +22,3 @@ unifdef-y += unistd_32.h unifdef-y += unistd_64.h unifdef-y += vm86.h unifdef-y += vsyscall.h -unifdef-y += swab.h
arch/x86/include/asm/byteorder.h +0 -1
@@ -1,7 +1,6 @@#ifndef _ASM_X86_BYTEORDER_H#define _ASM_X86_BYTEORDER_H -#include <asm/swab.h> #include <linux/byteorder/little_endian.h> #endif /* _ASM_X86_BYTEORDER_H */
arch/xtensa/include/asm/Kbuild +0 -2
@@ -1,3 +1 @@ include include/asm-generic/Kbuild.asm - -unifdef-y += swab.h
arch/xtensa/include/asm/byteorder.h +0 -2
@@ -1,8 +1,6 @@#ifndef _XTENSA_BYTEORDER_H#define _XTENSA_BYTEORDER_H -#include <asm/swab.h> -#ifdef __XTENSA_EL__#include <linux/byteorder/little_endian.h> #elif defined(__XTENSA_EB__)
include/asm-frv/Kbuild +0 -1
@@ -3,4 +3,3 @@ include include/asm-generic/Kbuild.asm header-y += registers.h unifdef-y += termios.h -unifdef-y += swab.h
include/asm-frv/byteorder.h +0 -1
@@ -1,7 +1,6 @@#ifndef _ASM_BYTEORDER_H#define _ASM_BYTEORDER_H -#include <asm/swab.h> #include <linux/byteorder/big_endian.h> #endif /* _ASM_BYTEORDER_H */
include/asm-generic/Kbuild.asm +1 -0
@@ -31,6 +31,7 @@ unifdef-y += socket.h unifdef-y += sockios.h unifdef-y += stat.h unifdef-y += statfs.h +unifdef-y += swab.h unifdef-y += termbits.h unifdef-y += termios.h unifdef-y += types.h
include/asm-m32r/Kbuild +0 -1
@@ -1,2 +1 @@ include include/asm-generic/Kbuild.asm -unifdef-y += swab.h
include/asm-m32r/byteorder.h +0 -2
@@ -1,8 +1,6 @@#ifndef _ASM_M32R_BYTEORDER_H#define _ASM_M32R_BYTEORDER_H -#include <asm/swab.h> -#if defined(__LITTLE_ENDIAN__)# include <linux/byteorder/little_endian.h> #else
include/asm-m68k/Kbuild +0 -1
@@ -1,3 +1,2 @@ include include/asm-generic/Kbuild.asm header-y += cachectl.h -unifdef-y += swab.h
include/asm-m68k/byteorder.h +0 -1
@@ -1,7 +1,6 @@#ifndef _M68K_BYTEORDER_H#define _M68K_BYTEORDER_H -#include <asm/swab.h> #include <linux/byteorder/big_endian.h> #endif /* _M68K_BYTEORDER_H */
include/asm-mn10300/Kbuild +0 -1
@@ -1,2 +1 @@ include include/asm-generic/Kbuild.asm -unifdef-y += swab.h
include/asm-mn10300/byteorder.h +0 -1
@@ -1,7 +1,6 @@#ifndef _ASM_BYTEORDER_H#define _ASM_BYTEORDER_H -#include <asm/swab.h> #include <linux/byteorder/little_endian.h> #endif /* _ASM_BYTEORDER_H */
include/linux/swab.h +1 -1
@@ -3,7 +3,7 @@#include <linux/types.h> #include <linux/compiler.h> -#include <asm/byteorder.h> +#include <asm/swab.h> /* * casts are necessary for constants, because we never know how for sure
Signature · 1 line
1.6.1.212.g4b3ec