Commit f01f0f05 authored by David Woodhouse's avatar David Woodhouse Committed by Linus Torvalds

[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: default avatarDavid Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 651c923a
include include/asm-generic/Kbuild.asm include include/asm-generic/Kbuild.asm
header-y += boot.h debugreg.h ldt.h setup.h ucontext.h header-y += boot.h debugreg.h ldt.h ucontext.h
unifdef-y += mtrr.h vm86.h unifdef-y += mtrr.h setup.h vm86.h
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#ifndef _i386_SETUP_H #ifndef _i386_SETUP_H
#define _i386_SETUP_H #define _i386_SETUP_H
#ifdef __KERNEL__
#include <linux/pfn.h> #include <linux/pfn.h>
/* /*
...@@ -13,6 +14,7 @@ ...@@ -13,6 +14,7 @@
*/ */
#define MAXMEM_PFN PFN_DOWN(MAXMEM) #define MAXMEM_PFN PFN_DOWN(MAXMEM)
#define MAX_NONPAE_PFN (1 << 20) #define MAX_NONPAE_PFN (1 << 20)
#endif
#define PARAM_SIZE 4096 #define PARAM_SIZE 4096
#define COMMAND_LINE_SIZE 256 #define COMMAND_LINE_SIZE 256
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment