diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-30 17:53:32 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-30 17:53:32 -0400 |
| commit | 65fb0d23fcddd8697c871047b700c78817bdaa43 (patch) | |
| tree | 119e6e5f276622c4c862f6c9b6d795264ba1603a /arch/x86/lguest/boot.c | |
| parent | 8c083f081d0014057901c68a0a3e0f8ca7ac8d23 (diff) | |
| parent | dfbbe89e197a77f2c8046a51c74e33e35f878080 (diff) | |
Merge branch 'linus' into cpumask-for-linus
Conflicts:
arch/x86/kernel/cpu/common.c
Diffstat (limited to 'arch/x86/lguest/boot.c')
| -rw-r--r-- | arch/x86/lguest/boot.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c index 9fe4ddaa8f6f..90e44a10e68a 100644 --- a/arch/x86/lguest/boot.c +++ b/arch/x86/lguest/boot.c | |||
| @@ -1058,14 +1058,6 @@ __init void lguest_init(void) | |||
| 1058 | * lguest_init() where the rest of the fairly chaotic boot setup | 1058 | * lguest_init() where the rest of the fairly chaotic boot setup |
| 1059 | * occurs. */ | 1059 | * occurs. */ |
| 1060 | 1060 | ||
| 1061 | /* The native boot code sets up initial page tables immediately after | ||
| 1062 | * the kernel itself, and sets init_pg_tables_end so they're not | ||
| 1063 | * clobbered. The Launcher places our initial pagetables somewhere at | ||
| 1064 | * the top of our physical memory, so we don't need extra space: set | ||
| 1065 | * init_pg_tables_end to the end of the kernel. */ | ||
| 1066 | init_pg_tables_start = __pa(pg0); | ||
| 1067 | init_pg_tables_end = __pa(pg0); | ||
| 1068 | |||
| 1069 | /* As described in head_32.S, we map the first 128M of memory. */ | 1061 | /* As described in head_32.S, we map the first 128M of memory. */ |
| 1070 | max_pfn_mapped = (128*1024*1024) >> PAGE_SHIFT; | 1062 | max_pfn_mapped = (128*1024*1024) >> PAGE_SHIFT; |
| 1071 | 1063 | ||