diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-09-12 23:36:05 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-13 10:32:16 -0400 |
| commit | f01f0f052d1255dcdcf11d4872c4bca95e46b36c (patch) | |
| tree | 813950ac98390893ede57af6693ffe42bc5609a5 /include/asm-i386/setup.h | |
| parent | 651c923a4446dc5aee385d81c2436d6edf8c9a0c (diff) | |
[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.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-i386/setup.h b/include/asm-i386/setup.h index f737e423029..2734909eff8 100644 --- a/include/asm-i386/setup.h +++ b/include/asm-i386/setup.h | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | #ifndef _i386_SETUP_H | 6 | #ifndef _i386_SETUP_H |
| 7 | #define _i386_SETUP_H | 7 | #define _i386_SETUP_H |
| 8 | 8 | ||
| 9 | #ifdef __KERNEL__ | ||
| 9 | #include <linux/pfn.h> | 10 | #include <linux/pfn.h> |
| 10 | 11 | ||
| 11 | /* | 12 | /* |
| @@ -13,6 +14,7 @@ | |||
| 13 | */ | 14 | */ |
| 14 | #define MAXMEM_PFN PFN_DOWN(MAXMEM) | 15 | #define MAXMEM_PFN PFN_DOWN(MAXMEM) |
| 15 | #define MAX_NONPAE_PFN (1 << 20) | 16 | #define MAX_NONPAE_PFN (1 << 20) |
| 17 | #endif | ||
| 16 | 18 | ||
| 17 | #define PARAM_SIZE 4096 | 19 | #define PARAM_SIZE 4096 |
| 18 | #define COMMAND_LINE_SIZE 256 | 20 | #define COMMAND_LINE_SIZE 256 |