From 78f83840764c5572d10ca7c56e07e8a9d37fc5ee Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Wed, 25 Jun 2008 18:02:06 -0700 Subject: [PATCH] --- yaml --- r: 99940 b: refs/heads/master c: 5092301c7250d7459b79fe40dae43eca3b518e92 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/setup.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index f9b9a0f73f47..d06a9f3b4b76 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 29f784e369a914b5926e01a0b0caae0b47f6452a +refs/heads/master: 5092301c7250d7459b79fe40dae43eca3b518e92 diff --git a/trunk/arch/x86/kernel/setup.c b/trunk/arch/x86/kernel/setup.c index 35022dc10428..f2e314b5b5fa 100644 --- a/trunk/arch/x86/kernel/setup.c +++ b/trunk/arch/x86/kernel/setup.c @@ -124,12 +124,6 @@ struct boot_params __initdata boot_params; struct boot_params boot_params; #endif -/* This value is set up by the early boot code to point to the value - immediately after the boot time page tables. It contains a *physical* - address, and must not be in the .bss segment! */ -unsigned long init_pg_tables_start __initdata = ~0UL; -unsigned long init_pg_tables_end __initdata = ~0UL; - /* * Machine setup.. */ @@ -156,6 +150,12 @@ static struct resource bss_resource = { #ifdef CONFIG_X86_32 +/* This value is set up by the early boot code to point to the value + immediately after the boot time page tables. It contains a *physical* + address, and must not be in the .bss segment! */ +unsigned long init_pg_tables_start __initdata = ~0UL; +unsigned long init_pg_tables_end __initdata = ~0UL; + static struct resource video_ram_resource = { .name = "Video RAM area", .start = 0xa0000,