* [PATCH -tip] x86: msr.h linux/types is only required for __KERNEL__
@ 2009-06-17 8:41 Jaswinder Singh Rajput
2009-06-17 17:01 ` [tip:x86/urgent] x86: msr.h linux/types.h " tip-bot for Jaswinder Singh Rajput
0 siblings, 1 reply; 2+ messages in thread
From: Jaswinder Singh Rajput @ 2009-06-17 8:41 UTC (permalink / raw)
To: H. Peter Anvin, Ingo Molnar, x86 maintainers, LKML
<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@gmail.com>
---
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 */
--
1.6.0.6
^ permalink raw reply [flat|nested] 2+ messages in thread
* [tip:x86/urgent] x86: msr.h linux/types.h is only required for __KERNEL__
2009-06-17 8:41 [PATCH -tip] x86: msr.h linux/types is only required for __KERNEL__ Jaswinder Singh Rajput
@ 2009-06-17 17:01 ` tip-bot for Jaswinder Singh Rajput
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Jaswinder Singh Rajput @ 2009-06-17 17:01 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, hpa, mingo, jaswinder, jaswinderrajput, hpa, tglx, mingo
Commit-ID: 8fa62ad9d24e24707164ac7a97cbe59fe78a8591
Gitweb: http://git.kernel.org/tip/8fa62ad9d24e24707164ac7a97cbe59fe78a8591
Author: Jaswinder Singh Rajput <jaswinder@kernel.org>
AuthorDate: Wed, 17 Jun 2009 14:11:10 +0530
Committer: Ingo Molnar <mingo@elte.hu>
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@gmail.com>
Cc: "H. Peter Anvin" <hpa@kernel.org>
LKML-Reference: <1245228070.2662.1.camel@ht.satnam>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
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 */
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-06-17 17:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-06-17 8:41 [PATCH -tip] x86: msr.h linux/types is only required for __KERNEL__ Jaswinder Singh Rajput
2009-06-17 17:01 ` [tip:x86/urgent] x86: msr.h linux/types.h " tip-bot for Jaswinder Singh Rajput
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®