diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /arch/x86/kernel/setup.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'arch/x86/kernel/setup.c')
| -rw-r--r-- | arch/x86/kernel/setup.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 5a0484a95ad6..4be9b398470e 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c | |||
| @@ -976,6 +976,11 @@ void __init setup_arch(char **cmdline_p) | |||
| 976 | paging_init(); | 976 | paging_init(); |
| 977 | x86_init.paging.pagetable_setup_done(swapper_pg_dir); | 977 | x86_init.paging.pagetable_setup_done(swapper_pg_dir); |
| 978 | 978 | ||
| 979 | if (boot_cpu_data.cpuid_level >= 0) { | ||
| 980 | /* A CPU has %cr4 if and only if it has CPUID */ | ||
| 981 | mmu_cr4_features = read_cr4(); | ||
| 982 | } | ||
| 983 | |||
| 979 | #ifdef CONFIG_X86_32 | 984 | #ifdef CONFIG_X86_32 |
| 980 | /* sync back kernel address range */ | 985 | /* sync back kernel address range */ |
| 981 | clone_pgd_range(initial_page_table + KERNEL_PGD_BOUNDARY, | 986 | clone_pgd_range(initial_page_table + KERNEL_PGD_BOUNDARY, |