aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorCyrill Gorcunov <gorcunov@gmail.com>2009-01-14 23:37:50 +0300
committerIngo Molnar <mingo@elte.hu>2009-03-26 18:29:49 +0100
commit17d140402e6f0fd5dde2fdf8d045e3f95f865663 (patch)
tree4b2a1b5f07eb0ce92bb4b974bc11383ba0d5f934 /arch/x86
parentMerge commit 'v2.6.29' into core/header-fixes (diff)
downloadlinux-dev-17d140402e6f0fd5dde2fdf8d045e3f95f865663.tar.xz
linux-dev-17d140402e6f0fd5dde2fdf8d045e3f95f865663.zip
x86: headers cleanup - setup.h
Impact: cleanup 'make headers_check' warn us about leaking of kernel private (mostly compile time vars) data to userspace in headers. Fix it. Guard this one by __KERNEL__. Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/include/asm/setup.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h
index 5a3a13715756..c2308f5250fd 100644
--- a/arch/x86/include/asm/setup.h
+++ b/arch/x86/include/asm/setup.h
@@ -1,6 +1,8 @@
#ifndef _ASM_X86_SETUP_H
#define _ASM_X86_SETUP_H
+#ifdef __KERNEL__
+
#define COMMAND_LINE_SIZE 2048
#ifndef __ASSEMBLY__
@@ -33,8 +35,6 @@ struct x86_quirks {
#endif /* __ASSEMBLY__ */
-#ifdef __KERNEL__
-
#ifdef __i386__
#include <linux/pfn.h>