summaryrefslogtreecommitdiff
path: root/include/asm-i386/setup.h
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2006-09-13 03:36:05 (GMT)
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-13 14:32:16 (GMT)
commitf01f0f052d1255dcdcf11d4872c4bca95e46b36c (patch)
tree813950ac98390893ede57af6693ffe42bc5609a5 /include/asm-i386/setup.h
parent651c923a4446dc5aee385d81c2436d6edf8c9a0c (diff)
downloadlinux-f01f0f052d1255dcdcf11d4872c4bca95e46b36c.tar.xz
[PATCH] headers_check: don't expose PFN stuff to userspace in <asm-i386/setup.h>
The header file <linux/pfn.h> doesn't exist in userspace and probably shouldn't -- but it's used unconditionally in <asm-i386/setup.h>. Protect it with #ifdef __KERNEL__ and move setup.h from $(header-y) to $(unifdef-y) in Kbuild accordingly. Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-i386/setup.h')
-rw-r--r--include/asm-i386/setup.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-i386/setup.h b/include/asm-i386/setup.h
index f737e42..2734909 100644
--- a/include/asm-i386/setup.h
+++ b/include/asm-i386/setup.h
@@ -6,6 +6,7 @@
#ifndef _i386_SETUP_H
#define _i386_SETUP_H
+#ifdef __KERNEL__
#include <linux/pfn.h>
/*
@@ -13,6 +14,7 @@
*/
#define MAXMEM_PFN PFN_DOWN(MAXMEM)
#define MAX_NONPAE_PFN (1 << 20)
+#endif
#define PARAM_SIZE 4096
#define COMMAND_LINE_SIZE 256