From eb551446ba2b438c161fabd19422d4bc11af7c13 Mon Sep 17 00:00:00 2001 From: Vivek Goyal Date: Thu, 10 May 2007 22:22:15 -0700 Subject: [PATCH] --- yaml --- r: 55879 b: refs/heads/master c: 069f11f9d66bc582fb40a37a7b92363f5d321969 h: refs/heads/master i: 55877: 0518a247c84321329807f422d2f9229f1e13a4c5 55875: a40be6fb68a0f1e227a2b10d445ff64abfb74932 55871: d1820412130ee5128bcdfb8b90e342853db7e35f v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/head64.c | 7 ------- trunk/include/asm-x86_64/page.h | 9 +++++++++ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index bc1caa317375..9812329e07da 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6041b57c6c99dcb59524f1bb0db0628c2689a464 +refs/heads/master: 069f11f9d66bc582fb40a37a7b92363f5d321969 diff --git a/trunk/arch/x86_64/kernel/head64.c b/trunk/arch/x86_64/kernel/head64.c index 213d90e04755..6c34bdd22e26 100644 --- a/trunk/arch/x86_64/kernel/head64.c +++ b/trunk/arch/x86_64/kernel/head64.c @@ -62,13 +62,6 @@ void __init x86_64_start_kernel(char * real_mode_data) { int i; - /* - * Make sure kernel is aligned to 2MB address. Catching it at compile - * time is better. Change your config file and compile the kernel - * for a 2MB aligned address (CONFIG_PHYSICAL_START) - */ - BUILD_BUG_ON(CONFIG_PHYSICAL_START & (__KERNEL_ALIGN - 1)); - /* clear bss before set_intr_gate with early_idt_handler */ clear_bss(); diff --git a/trunk/include/asm-x86_64/page.h b/trunk/include/asm-x86_64/page.h index dee632fa457d..e327c830da0c 100644 --- a/trunk/include/asm-x86_64/page.h +++ b/trunk/include/asm-x86_64/page.h @@ -80,6 +80,15 @@ extern unsigned long phys_base; #define __PHYSICAL_START CONFIG_PHYSICAL_START #define __KERNEL_ALIGN 0x200000 +/* + * Make sure kernel is aligned to 2MB address. Catching it at compile + * time is better. Change your config file and compile the kernel + * for a 2MB aligned address (CONFIG_PHYSICAL_START) + */ +#if (CONFIG_PHYSICAL_START % __KERNEL_ALIGN) != 0 +#error "CONFIG_PHYSICAL_START must be a multiple of 2MB" +#endif + #define __START_KERNEL (__START_KERNEL_map + __PHYSICAL_START) #define __START_KERNEL_map _AC(0xffffffff80000000, UL) #define __PAGE_OFFSET _AC(0xffff810000000000, UL)