aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlauber Costa <gcosta@redhat.com>2008-06-04 23:05:39 -0700
committerIngo Molnar <mingo@elte.hu>2008-07-08 12:48:25 +0200
commit7f6cbc905ee22c457e0dcd0bba9d4affbc290a6f (patch)
tree4ebc99247ffde83356ec06d05d297cdb61b7c0b8
parent1481a3dd42c21ac4a8b9497cb9f5df816d6b064f (diff)
downloadkernel_samsung_crespo-7f6cbc905ee22c457e0dcd0bba9d4affbc290a6f.zip
kernel_samsung_crespo-7f6cbc905ee22c457e0dcd0bba9d4affbc290a6f.tar.gz
kernel_samsung_crespo-7f6cbc905ee22c457e0dcd0bba9d4affbc290a6f.tar.bz2
x86: take load_sp0 out of smpboot.c
there's no particular reason to do load_sp0 in different places for i386 and x86_64. They should all be in cpu_init. Right now, cpu_init itself is not integrated, but with this patch, the code becomes closer to each other, making in easier to integrate when the time comes. Furthermore, although doing it in do_boot_cpu for x86_64 is fine, since it's only a copy, load_sp0 should be executed in the cpu it refers to anyway. Signed-off-by: Glauber Costa <gcosta@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/kernel/setup64.c1
-rw-r--r--arch/x86/kernel/smpboot.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/setup64.c b/arch/x86/kernel/setup64.c
index 70ff071..151d315 100644
--- a/arch/x86/kernel/setup64.c
+++ b/arch/x86/kernel/setup64.c
@@ -247,6 +247,7 @@ void __cpuinit cpu_init (void)
BUG();
enter_lazy_tlb(&init_mm, me);
+ load_sp0(t, &current->thread);
set_tss_desc(cpu, t);
load_TR_desc();
load_LDT(&init_mm.context);
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 67af727..3b48d1f 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -864,7 +864,6 @@ do_rest:
irq_ctx_init(cpu);
#else
cpu_pda(cpu)->pcurrent = c_idle.idle;
- load_sp0(&per_cpu(init_tss, cpu), &c_idle.idle->thread);
clear_tsk_thread_flag(c_idle.idle, TIF_FORK);
#endif
early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);