aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/head64.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2009-01-13 06:41:35 -0500
committerIngo Molnar <mingo@elte.hu>2009-01-16 08:19:40 -0500
commitc8f3329a0ddd751241e96b4100df7eda14b2cbc6 (patch)
tree55e201da3d0d26076d4e31ef68aad26bf9f3e08c /arch/x86/kernel/head64.c
parentf32ff5388d86518c0375ccdb330d3b459b9c405e (diff)
x86: use static _cpu_pda array
_cpu_pda array first uses statically allocated storage in data.init and then switches to allocated bootmem to conserve space. However, after folding pda area into percpu area, _cpu_pda array will be removed completely. Drop the reallocation part to simplify the code for soon-to-follow changes. Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/head64.c')
-rw-r--r--arch/x86/kernel/head64.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
index 76ffba2aa66d..462d0beccb6b 100644
--- a/arch/x86/kernel/head64.c
+++ b/arch/x86/kernel/head64.c
@@ -29,20 +29,8 @@
29/* boot cpu pda, referenced by head_64.S to initialize %gs for boot CPU */ 29/* boot cpu pda, referenced by head_64.S to initialize %gs for boot CPU */
30struct x8664_pda _boot_cpu_pda; 30struct x8664_pda _boot_cpu_pda;
31 31
32#ifdef CONFIG_SMP
33/*
34 * We install an empty cpu_pda pointer table to indicate to early users
35 * (numa_set_node) that the cpu_pda pointer table for cpus other than
36 * the boot cpu is not yet setup.
37 */
38static struct x8664_pda *__cpu_pda[NR_CPUS] __initdata;
39#else
40static struct x8664_pda *__cpu_pda[NR_CPUS] __read_mostly;
41#endif
42
43void __init x86_64_init_pda(void) 32void __init x86_64_init_pda(void)
44{ 33{
45 _cpu_pda = __cpu_pda;
46 cpu_pda(0) = &_boot_cpu_pda; 34 cpu_pda(0) = &_boot_cpu_pda;
47 cpu_pda(0)->data_offset = 35 cpu_pda(0)->data_offset =
48 (unsigned long)(__per_cpu_load - __per_cpu_start); 36 (unsigned long)(__per_cpu_load - __per_cpu_start);