Messages in this thread Patch in this message | | | Date | Tue, 13 Jan 2009 15:09:05 +0300 | From | Cyrill Gorcunov <> | Subject | [PATCH -tip] x86: headers - include linux/types.h instead of asm/types.h |
| |
Impact: cleanup
'make headers_check' warns that linux/types.h is preferred over asm/types.h. So be it.
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org> CC: Jaswinder Singh Rajput <jaswinderrajput@gmail.com> CC: Sam Ravnborg <sam@ravnborg.org> CC: Harvey Harrison <harvey.harrison@gmail.com> ---
arch/x86/include/asm/e820.h | 2 ++ arch/x86/include/asm/kvm.h | 2 +- arch/x86/include/asm/mce.h | 2 +- arch/x86/include/asm/mtrr.h | 1 + arch/x86/include/asm/ptrace-abi.h | 2 +- arch/x86/include/asm/sigcontext.h | 2 +- arch/x86/include/asm/swab.h | 2 +- 7 files changed, 8 insertions(+), 5 deletions(-)
Index: linux-2.6.git/arch/x86/include/asm/e820.h =================================================================== --- linux-2.6.git.orig/arch/x86/include/asm/e820.h +++ linux-2.6.git/arch/x86/include/asm/e820.h @@ -1,5 +1,6 @@ #ifndef _ASM_X86_E820_H #define _ASM_X86_E820_H + #define E820MAP 0x2d0 /* our map */ #define E820MAX 128 /* number of entries in E820MAP */ @@ -49,6 +50,7 @@ #define E820_RESERVED_KERN 128 #ifndef __ASSEMBLY__ +#include <linux/types.h> struct e820entry { __u64 addr; /* start of memory segment */ __u64 size; /* size of memory segment */ Index: linux-2.6.git/arch/x86/include/asm/kvm.h =================================================================== --- linux-2.6.git.orig/arch/x86/include/asm/kvm.h +++ linux-2.6.git/arch/x86/include/asm/kvm.h @@ -6,7 +6,7 @@ * */ -#include <asm/types.h> +#include <linux/types.h> #include <linux/ioctl.h> /* Architectural interrupt line count. */ Index: linux-2.6.git/arch/x86/include/asm/mce.h =================================================================== --- linux-2.6.git.orig/arch/x86/include/asm/mce.h +++ linux-2.6.git/arch/x86/include/asm/mce.h @@ -4,7 +4,7 @@ #ifdef __x86_64__ #include <asm/ioctls.h> -#include <asm/types.h> +#include <linux/types.h> /* * Machine Check support for x86 Index: linux-2.6.git/arch/x86/include/asm/mtrr.h =================================================================== --- linux-2.6.git.orig/arch/x86/include/asm/mtrr.h +++ linux-2.6.git/arch/x86/include/asm/mtrr.h @@ -23,6 +23,7 @@ #ifndef _ASM_X86_MTRR_H #define _ASM_X86_MTRR_H +#include <linux/types.h> #include <linux/ioctl.h> #include <linux/errno.h> Index: linux-2.6.git/arch/x86/include/asm/ptrace-abi.h =================================================================== --- linux-2.6.git.orig/arch/x86/include/asm/ptrace-abi.h +++ linux-2.6.git/arch/x86/include/asm/ptrace-abi.h @@ -83,7 +83,7 @@ #ifdef CONFIG_X86_PTRACE_BTS #ifndef __ASSEMBLY__ -#include <asm/types.h> +#include <linux/types.h> /* configuration/status structure used in PTRACE_BTS_CONFIG and PTRACE_BTS_STATUS commands. Index: linux-2.6.git/arch/x86/include/asm/sigcontext.h =================================================================== --- linux-2.6.git.orig/arch/x86/include/asm/sigcontext.h +++ linux-2.6.git/arch/x86/include/asm/sigcontext.h @@ -2,7 +2,7 @@ #define _ASM_X86_SIGCONTEXT_H #include <linux/compiler.h> -#include <asm/types.h> +#include <linux/types.h> #define FP_XSTATE_MAGIC1 0x46505853U #define FP_XSTATE_MAGIC2 0x46505845U Index: linux-2.6.git/arch/x86/include/asm/swab.h =================================================================== --- linux-2.6.git.orig/arch/x86/include/asm/swab.h +++ linux-2.6.git/arch/x86/include/asm/swab.h @@ -1,7 +1,7 @@ #ifndef _ASM_X86_SWAB_H #define _ASM_X86_SWAB_H -#include <asm/types.h> +#include <linux/types.h> #include <linux/compiler.h> static inline __attribute_const__ __u32 __arch_swab32(__u32 val)
| |