diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-08 11:14:58 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 11:14:58 +0200 |
| commit | 3de352bbd86f890dd0c5e1c09a6a1b0b29e0f8ce (patch) | |
| tree | d4c5eba8cd2abefd7c9f16d089393f0f5999cf63 /arch/x86/xen | |
| parent | 1b8ba39a3fad9c58532f6dad12c94d6e675be656 (diff) | |
| parent | 9340e1ccdf7b9b22a2be7f51cd74e8b5e11961bf (diff) | |
| download | op-kernel-dev-3de352bbd86f890dd0c5e1c09a6a1b0b29e0f8ce.zip op-kernel-dev-3de352bbd86f890dd0c5e1c09a6a1b0b29e0f8ce.tar.gz | |
Merge branch 'x86/mpparse' into x86/devel
Conflicts:
arch/x86/Kconfig
arch/x86/kernel/io_apic_32.c
arch/x86/kernel/setup_64.c
arch/x86/mm/init_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/xen')
| -rw-r--r-- | arch/x86/xen/enlighten.c | 3 | ||||
| -rw-r--r-- | arch/x86/xen/setup.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index bd74229..fe60aa9 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -1273,6 +1273,7 @@ asmlinkage void __init xen_start_kernel(void) pgd = (pgd_t *)xen_start_info->pt_base; + init_pg_tables_start = __pa(pgd); init_pg_tables_end = __pa(pgd) + xen_start_info->nr_pt_frames*PAGE_SIZE; init_mm.pgd = pgd; /* use the Xen pagetables to start */ @@ -1316,5 +1317,5 @@ asmlinkage void __init xen_start_kernel(void) } /* Start the world */ - start_kernel(); + i386_start_kernel(); } diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c index 4884478..a295758 100644 --- a/arch/x86/xen/setup.c +++ b/arch/x86/xen/setup.c @@ -40,8 +40,8 @@ char * __init xen_memory_setup(void) max_pfn = min(MAX_DOMAIN_PAGES, max_pfn); e820.nr_map = 0; - add_memory_region(0, LOWMEMSIZE(), E820_RAM); - add_memory_region(HIGH_MEMORY, PFN_PHYS(max_pfn)-HIGH_MEMORY, E820_RAM); + e820_add_region(0, LOWMEMSIZE(), E820_RAM); + e820_add_region(HIGH_MEMORY, PFN_PHYS(max_pfn)-HIGH_MEMORY, E820_RAM); return "Xen"; } |
