Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 74d96f018673759d04d032c137d132f6447bfb1e

Authored by Harvey Harrison
Committed by Linus Torvalds
1 parent aa0effbd1c
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 42 changed files with 2 additions and 49 deletions Side-by-side Diff

arch/alpha/include/asm/Kbuild
Diff comments   View file @ 74d96f0
... ... @@ -9,5 +9,4 @@
9 9 unifdef-y += fpu.h
10 10 unifdef-y += sysinfo.h
11 11 unifdef-y += compiler.h
12   -unifdef-y += swab.h
arch/alpha/include/asm/byteorder.h
Diff comments   View file @ 74d96f0
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 */
arch/arm/include/asm/Kbuild
Diff comments   View file @ 74d96f0
1 1 include include/asm-generic/Kbuild.asm
2 2  
3 3 unifdef-y += hwcap.h
4   -unifdef-y += swab.h
arch/arm/include/asm/byteorder.h
Diff comments   View file @ 74d96f0
... ... @@ -15,8 +15,6 @@
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
arch/avr32/include/asm/Kbuild
Diff comments   View file @ 74d96f0
1 1 include include/asm-generic/Kbuild.asm
2 2  
3   -header-y += swab.h
4 3 header-y += cachectl.h
arch/avr32/include/asm/byteorder.h
Diff comments   View file @ 74d96f0
... ... @@ -4,7 +4,6 @@
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 */
arch/blackfin/include/asm/Kbuild
Diff comments   View file @ 74d96f0
1 1 include include/asm-generic/Kbuild.asm
2 2  
3 3 unifdef-y += fixed_code.h
4   -unifdef-y += swab.h
arch/blackfin/include/asm/byteorder.h
Diff comments   View file @ 74d96f0
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 */
arch/cris/include/asm/Kbuild
Diff comments   View file @ 74d96f0
... ... @@ -9,5 +9,4 @@
9 9  
10 10 unifdef-y += etraxgpio.h
11 11 unifdef-y += rs485.h
12   -unifdef-y += swab.h
arch/cris/include/asm/byteorder.h
Diff comments   View file @ 74d96f0
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
arch/h8300/include/asm/Kbuild
Diff comments   View file @ 74d96f0
1 1 include include/asm-generic/Kbuild.asm
2   -unifdef-y += swab.h
arch/h8300/include/asm/byteorder.h
Diff comments   View file @ 74d96f0
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 */
arch/ia64/include/asm/Kbuild
Diff comments   View file @ 74d96f0
... ... @@ -14,5 +14,4 @@
14 14 unifdef-y += intrinsics.h
15 15 unifdef-y += perfmon.h
16 16 unifdef-y += ustack.h
17   -unifdef-y += swab.h
arch/ia64/include/asm/byteorder.h
Diff comments   View file @ 74d96f0
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 */
arch/m68knommu/include/asm/Kbuild
Diff comments   View file @ 74d96f0
1 1 include include/asm-generic/Kbuild.asm
2   -
3   -unifdef-y += swab.h
arch/m68knommu/include/asm/byteorder.h
Diff comments   View file @ 74d96f0
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 */
arch/mips/include/asm/Kbuild
Diff comments   View file @ 74d96f0
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
arch/mips/include/asm/byteorder.h
Diff comments   View file @ 74d96f0
... ... @@ -8,8 +8,6 @@
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__)
arch/parisc/include/asm/Kbuild
Diff comments   View file @ 74d96f0
1 1 include include/asm-generic/Kbuild.asm
2 2  
3 3 unifdef-y += pdc.h
4   -unifdef-y += swab.h
arch/parisc/include/asm/byteorder.h
Diff comments   View file @ 74d96f0
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 */
arch/powerpc/include/asm/Kbuild
Diff comments   View file @ 74d96f0
... ... @@ -35,5 +35,4 @@
35 35 unifdef-y += termios.h
36 36 unifdef-y += types.h
37 37 unifdef-y += unistd.h
38   -unifdef-y += swab.h
arch/powerpc/include/asm/byteorder.h
Diff comments   View file @ 74d96f0
... ... @@ -7,8 +7,6 @@
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 */
arch/s390/include/asm/Kbuild
Diff comments   View file @ 74d96f0
... ... @@ -13,5 +13,4 @@
13 13 unifdef-y += debug.h
14 14 unifdef-y += chpid.h
15 15 unifdef-y += schid.h
16   -unifdef-y += swab.h
arch/s390/include/asm/byteorder.h
Diff comments   View file @ 74d96f0
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 */
arch/sh/include/asm/Kbuild
Diff comments   View file @ 74d96f0
... ... @@ -6,5 +6,4 @@
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
arch/sh/include/asm/byteorder.h
Diff comments   View file @ 74d96f0
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
arch/sparc/include/asm/Kbuild
Diff comments   View file @ 74d96f0
... ... @@ -17,5 +17,4 @@
17 17 header-y += uctx.h
18 18 header-y += utrap.h
19 19 header-y += watchdog.h
20   -header-y += swab.h
arch/sparc/include/asm/byteorder.h
Diff comments   View file @ 74d96f0
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 */
arch/x86/include/asm/Kbuild
Diff comments   View file @ 74d96f0
... ... @@ -22,5 +22,4 @@
22 22 unifdef-y += unistd_64.h
23 23 unifdef-y += vm86.h
24 24 unifdef-y += vsyscall.h
25   -unifdef-y += swab.h
arch/x86/include/asm/byteorder.h
Diff comments   View file @ 74d96f0
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 */
arch/xtensa/include/asm/Kbuild
Diff comments   View file @ 74d96f0
1 1 include include/asm-generic/Kbuild.asm
2   -
3   -unifdef-y += swab.h
arch/xtensa/include/asm/byteorder.h
Diff comments   View file @ 74d96f0
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__)
include/asm-frv/Kbuild
Diff comments   View file @ 74d96f0
... ... @@ -3,5 +3,4 @@
3 3 header-y += registers.h
4 4  
5 5 unifdef-y += termios.h
6   -unifdef-y += swab.h
include/asm-frv/byteorder.h
Diff comments   View file @ 74d96f0
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 */
include/asm-generic/Kbuild.asm
Diff comments   View file @ 74d96f0
... ... @@ -31,6 +31,7 @@
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
include/asm-m32r/Kbuild
Diff comments   View file @ 74d96f0
1 1 include include/asm-generic/Kbuild.asm
2   -unifdef-y += swab.h
include/asm-m32r/byteorder.h
Diff comments   View file @ 74d96f0
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
include/asm-m68k/Kbuild
Diff comments   View file @ 74d96f0
1 1 include include/asm-generic/Kbuild.asm
2 2 header-y += cachectl.h
3   -unifdef-y += swab.h
include/asm-m68k/byteorder.h
Diff comments   View file @ 74d96f0
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 */
include/asm-mn10300/Kbuild
Diff comments   View file @ 74d96f0
1 1 include include/asm-generic/Kbuild.asm
2   -unifdef-y += swab.h
include/asm-mn10300/byteorder.h
Diff comments   View file @ 74d96f0
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 */
include/linux/swab.h
Diff comments   View file @ 74d96f0
... ... @@ -3,7 +3,7 @@
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