lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'linus' into x86/pat2

Browse Source 
Conflicts:
	arch/x86/mm/init_64.c
This commit is contained in:
Ingo Molnar
2008-10-10 19:30:08 +02:00
parent b27a43c1e9 d403a6484f
commit 3dd392a407
819 changed files with 9576 additions and 5697 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/x86/mm/init_32.c
View File

@ -47,6 +47,7 @@
#include <asm/paravirt.h>
#include <asm/setup.h>
#include <asm/cacheflush.h>
#include <asm/smp.h>
unsigned int __VMALLOC_RESERVE = 128 << 20;
@ -513,11 +514,7 @@ static void __init pagetable_init(void)
{
pgd_t *pgd_base = swapper_pg_dir;
paravirt_pagetable_setup_start(pgd_base);
permanent_kmaps_init(pgd_base);
paravirt_pagetable_setup_done(pgd_base);
}
#ifdef CONFIG_ACPI_SLEEP