Skip to content

Commit

Permalink
byteorder: make swab.h include asm/swab.h like a regular header
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Harvey Harrison authored and Linus Torvalds committed Jan 15, 2009
1 parent aa0effb commit 74d96f0
Show file tree
Hide file tree
Showing 42 changed files with 2 additions and 49 deletions.
1 change: 0 additions & 1 deletion arch/alpha/include/asm/Kbuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,3 @@ unifdef-y += console.h
unifdef-y += fpu.h
unifdef-y += sysinfo.h
unifdef-y += compiler.h
unifdef-y += swab.h
1 change: 0 additions & 1 deletion arch/alpha/include/asm/byteorder.h
View file
Original file line number Diff line number Diff line change
@@ -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 */
1 change: 0 additions & 1 deletion arch/arm/include/asm/Kbuild
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
include include/asm-generic/Kbuild.asm

unifdef-y += hwcap.h
unifdef-y += swab.h
2 changes: 0 additions & 2 deletions arch/arm/include/asm/byteorder.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion arch/avr32/include/asm/Kbuild
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
include include/asm-generic/Kbuild.asm

header-y += swab.h
header-y += cachectl.h
1 change: 0 additions & 1 deletion arch/avr32/include/asm/byteorder.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
1 change: 0 additions & 1 deletion arch/blackfin/include/asm/Kbuild
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
include include/asm-generic/Kbuild.asm

unifdef-y += fixed_code.h
unifdef-y += swab.h
1 change: 0 additions & 1 deletion arch/blackfin/include/asm/byteorder.h
View file
Original file line number Diff line number Diff line change
@@ -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 */
1 change: 0 additions & 1 deletion arch/cris/include/asm/Kbuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,3 @@ header-y += sync_serial.h

unifdef-y += etraxgpio.h
unifdef-y += rs485.h
unifdef-y += swab.h
1 change: 0 additions & 1 deletion arch/cris/include/asm/byteorder.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#ifndef _CRIS_BYTEORDER_H
#define _CRIS_BYTEORDER_H

#include <asm/swab.h>
#include <linux/byteorder/little_endian.h>

#endif
Expand Down
1 change: 0 additions & 1 deletion arch/h8300/include/asm/Kbuild
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
include include/asm-generic/Kbuild.asm
unifdef-y += swab.h
1 change: 0 additions & 1 deletion arch/h8300/include/asm/byteorder.h
View file
Original file line number Diff line number Diff line change
@@ -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 */
1 change: 0 additions & 1 deletion arch/ia64/include/asm/Kbuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion arch/ia64/include/asm/byteorder.h
View file
Original file line number Diff line number Diff line change
@@ -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 */
2 changes: 0 additions & 2 deletions arch/m68knommu/include/asm/Kbuild
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
include include/asm-generic/Kbuild.asm

unifdef-y += swab.h
1 change: 0 additions & 1 deletion arch/m68knommu/include/asm/byteorder.h
View file
Original file line number Diff line number Diff line change
@@ -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 */
1 change: 0 additions & 1 deletion arch/mips/include/asm/Kbuild
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
include include/asm-generic/Kbuild.asm

header-y += cachectl.h sgidefs.h sysmips.h
header-y += swab.h
2 changes: 0 additions & 2 deletions arch/mips/include/asm/byteorder.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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__)
Expand Down
1 change: 0 additions & 1 deletion arch/parisc/include/asm/Kbuild
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
include include/asm-generic/Kbuild.asm

unifdef-y += pdc.h
unifdef-y += swab.h
1 change: 0 additions & 1 deletion arch/parisc/include/asm/byteorder.h
View file
Original file line number Diff line number Diff line change
@@ -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 */
1 change: 0 additions & 1 deletion arch/powerpc/include/asm/Kbuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 0 additions & 2 deletions arch/powerpc/include/asm/byteorder.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
1 change: 0 additions & 1 deletion arch/s390/include/asm/Kbuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,3 @@ unifdef-y += cmb.h
unifdef-y += debug.h
unifdef-y += chpid.h
unifdef-y += schid.h
unifdef-y += swab.h
1 change: 0 additions & 1 deletion arch/s390/include/asm/byteorder.h
View file
Original file line number Diff line number Diff line change
@@ -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 */
1 change: 0 additions & 1 deletion arch/sh/include/asm/Kbuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 0 additions & 2 deletions arch/sh/include/asm/byteorder.h
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion arch/sparc/include/asm/Kbuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,3 @@ header-y += traps.h
header-y += uctx.h
header-y += utrap.h
header-y += watchdog.h
header-y += swab.h
1 change: 0 additions & 1 deletion arch/sparc/include/asm/byteorder.h
View file
Original file line number Diff line number Diff line change
@@ -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 */
1 change: 0 additions & 1 deletion arch/x86/include/asm/Kbuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion arch/x86/include/asm/byteorder.h
View file
Original file line number Diff line number Diff line change
@@ -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 */
2 changes: 0 additions & 2 deletions arch/xtensa/include/asm/Kbuild
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
include include/asm-generic/Kbuild.asm

unifdef-y += swab.h
2 changes: 0 additions & 2 deletions arch/xtensa/include/asm/byteorder.h
View file
Original file line number Diff line number Diff line change
@@ -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__)
Expand Down
1 change: 0 additions & 1 deletion include/asm-frv/Kbuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@ include include/asm-generic/Kbuild.asm
header-y += registers.h

unifdef-y += termios.h
unifdef-y += swab.h
1 change: 0 additions & 1 deletion include/asm-frv/byteorder.h
View file
Original file line number Diff line number Diff line change
@@ -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 */
1 change: 1 addition & 0 deletions include/asm-generic/Kbuild.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion include/asm-m32r/Kbuild
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
include include/asm-generic/Kbuild.asm
unifdef-y += swab.h
2 changes: 0 additions & 2 deletions include/asm-m32r/byteorder.h
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion include/asm-m68k/Kbuild
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
include include/asm-generic/Kbuild.asm
header-y += cachectl.h
unifdef-y += swab.h
1 change: 0 additions & 1 deletion include/asm-m68k/byteorder.h
View file
Original file line number Diff line number Diff line change
@@ -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 */
1 change: 0 additions & 1 deletion include/asm-mn10300/Kbuild
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
include include/asm-generic/Kbuild.asm
unifdef-y += swab.h
1 change: 0 additions & 1 deletion include/asm-mn10300/byteorder.h
View file
Original file line number Diff line number Diff line change
@@ -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 */
2 changes: 1 addition & 1 deletion include/linux/swab.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 74d96f0

Please sign in to comment.