Commit-ID: 8fa62ad9d24e24707164ac7a97cbe59fe78a8591 Gitweb: http://git.kernel.org/tip/8fa62ad9d24e24707164ac7a97cbe59fe78a8591 Author: Jaswinder Singh Rajput <jaswinder@xxxxxxxxxx> AuthorDate: Wed, 17 Jun 2009 14:11:10 +0530 Committer: Ingo Molnar <mingo@xxxxxxx> CommitDate: Wed, 17 Jun 2009 18:56:01 +0200 x86: msr.h linux/types.h is only required for __KERNEL__ <linux/types.h> is only required for __KERNEL__ as whole file is covered with it Also fixed some spacing issues for usr/include/asm-x86/msr.h Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@xxxxxxxxx> Cc: "H. Peter Anvin" <hpa@xxxxxxxxxx> LKML-Reference: <1245228070.2662.1.camel@xxxxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxx> --- arch/x86/include/asm/msr.h | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h index 2260376..48ad9d2 100644 --- a/arch/x86/include/asm/msr.h +++ b/arch/x86/include/asm/msr.h @@ -3,13 +3,10 @@ #include <asm/msr-index.h> -#ifndef __ASSEMBLY__ -# include <linux/types.h> -#endif - #ifdef __KERNEL__ #ifndef __ASSEMBLY__ +#include <linux/types.h> #include <asm/asm.h> #include <asm/errno.h> #include <asm/cpumask.h> @@ -264,6 +261,4 @@ static inline int wrmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h) #endif /* CONFIG_SMP */ #endif /* __ASSEMBLY__ */ #endif /* __KERNEL__ */ - - #endif /* _ASM_X86_MSR_H */ -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|