diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2009-01-30 23:50:57 +0100 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2009-01-30 23:50:57 +0100 |
| commit | 9b7ed8faa034fc2d350e2eff5c68680eb5c43a07 (patch) | |
| tree | 5c94c34ad30e312604c1ce4f08ab6631b64a94f5 /arch/x86/kernel/head64.c | |
| parent | x86: add pte_set_flags/clear_flags for pte flag manipulation (diff) | |
| parent | Merge branch 'linus' into core/percpu (diff) | |
| download | linux-9b7ed8faa034fc2d350e2eff5c68680eb5c43a07.tar.xz linux-9b7ed8faa034fc2d350e2eff5c68680eb5c43a07.zip | |
Merge branch 'core/percpu' into x86/paravirt
Diffstat (limited to 'arch/x86/kernel/head64.c')
| -rw-r--r-- | arch/x86/kernel/head64.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c index b9a4d8c4b935..f5b272247690 100644 --- a/arch/x86/kernel/head64.c +++ b/arch/x86/kernel/head64.c @@ -26,27 +26,6 @@ #include <asm/bios_ebda.h> #include <asm/trampoline.h> -/* boot cpu pda */ -static struct x8664_pda _boot_cpu_pda; - -#ifdef CONFIG_SMP -/* - * We install an empty cpu_pda pointer table to indicate to early users - * (numa_set_node) that the cpu_pda pointer table for cpus other than - * the boot cpu is not yet setup. - */ -static struct x8664_pda *__cpu_pda[NR_CPUS] __initdata; -#else -static struct x8664_pda *__cpu_pda[NR_CPUS] __read_mostly; -#endif - -void __init x86_64_init_pda(void) -{ - _cpu_pda = __cpu_pda; - cpu_pda(0) = &_boot_cpu_pda; - pda_init(0); -} - static void __init zap_identity_mappings(void) { pgd_t *pgd = pgd_offset_k(0UL); @@ -112,8 +91,6 @@ void __init x86_64_start_kernel(char * real_mode_data) if (console_loglevel == 10) early_printk("Kernel alive\n"); - x86_64_init_pda(); - x86_64_start_reservations(real_mode_data); } |