提交 95c4bff0 编写于 作者: C Cyrill Gorcunov 提交者: H. Peter Anvin

x86: headers cleanup - boot.h

Impact: cleanup

'make headers_check' warn us about leaking of kernel private
(mostly compile time vars) data to userspace in headers. Fix it.

Neither BOOT_HEAP_SIZE, BOOT_STACK_SIZE refs
was found by searching thru net (ie in user-space area)
so fence this all by __KERNEL__ guard.
Signed-off-by: NCyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: NH. Peter Anvin <hpa@linux.intel.com>
上级 73310a16
...@@ -10,14 +10,16 @@ ...@@ -10,14 +10,16 @@
#define EXTENDED_VGA 0xfffe /* 80x50 mode */ #define EXTENDED_VGA 0xfffe /* 80x50 mode */
#define ASK_VGA 0xfffd /* ask for it at bootup */ #define ASK_VGA 0xfffd /* ask for it at bootup */
#ifdef __KERNEL__
/* Physical address where kernel should be loaded. */ /* Physical address where kernel should be loaded. */
#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \ #define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
+ (CONFIG_PHYSICAL_ALIGN - 1)) \ + (CONFIG_PHYSICAL_ALIGN - 1)) \
& ~(CONFIG_PHYSICAL_ALIGN - 1)) & ~(CONFIG_PHYSICAL_ALIGN - 1))
#if (defined CONFIG_KERNEL_BZIP2) #ifdef CONFIG_KERNEL_BZIP2
#define BOOT_HEAP_SIZE 0x400000 #define BOOT_HEAP_SIZE 0x400000
#else #else /* !CONFIG_KERNEL_BZIP2 */
#ifdef CONFIG_X86_64 #ifdef CONFIG_X86_64
#define BOOT_HEAP_SIZE 0x7000 #define BOOT_HEAP_SIZE 0x7000
...@@ -25,7 +27,7 @@ ...@@ -25,7 +27,7 @@
#define BOOT_HEAP_SIZE 0x4000 #define BOOT_HEAP_SIZE 0x4000
#endif #endif
#endif #endif /* !CONFIG_KERNEL_BZIP2 */
#ifdef CONFIG_X86_64 #ifdef CONFIG_X86_64
#define BOOT_STACK_SIZE 0x4000 #define BOOT_STACK_SIZE 0x4000
...@@ -33,4 +35,6 @@ ...@@ -33,4 +35,6 @@
#define BOOT_STACK_SIZE 0x1000 #define BOOT_STACK_SIZE 0x1000
#endif #endif
#endif /* __KERNEL__ */
#endif /* _ASM_X86_BOOT_H */ #endif /* _ASM_X86_BOOT_H */
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册