diff options
author | Tejun Heo <tj@kernel.org> | 2009-01-13 11:41:35 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-16 13:20:26 (GMT) |
commit | 004aa322f855a765741d9437a98dd8fe2e4f32a6 (patch) | |
tree | a1240d533edfb2bc451dab230c25fb1468a091dc /arch/x86/kernel/acpi | |
parent | 49357d19e4fb31e28796eaff83499e7584c26878 (diff) | |
download | linux-004aa322f855a765741d9437a98dd8fe2e4f32a6.tar.xz |
x86: misc clean up after the percpu update
Do the following cleanups:
* kill x86_64_init_pda() which now is equivalent to pda_init()
* use per_cpu_offset() instead of cpu_pda() when initializing
initial_gs
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/acpi')
-rw-r--r-- | arch/x86/kernel/acpi/sleep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c index 9ff67f8..4abff45 100644 --- a/arch/x86/kernel/acpi/sleep.c +++ b/arch/x86/kernel/acpi/sleep.c @@ -101,7 +101,7 @@ int acpi_save_state_mem(void) stack_start.sp = temp_stack + sizeof(temp_stack); early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(smp_processor_id()); - initial_gs = (unsigned long)cpu_pda(smp_processor_id()); + initial_gs = per_cpu_offset(smp_processor_id()); #endif initial_code = (unsigned long)wakeup_long64; saved_magic = 0x123456789abcdef0; |