From a72573876603dbf79ac12a8f35aad4c056fc7b0e Mon Sep 17 00:00:00 2001 From: Glauber Costa Date: Wed, 4 Jun 2008 23:05:39 -0700 Subject: [PATCH] --- yaml --- r: 99858 b: refs/heads/master c: 7f6cbc905ee22c457e0dcd0bba9d4affbc290a6f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/setup64.c | 1 + trunk/arch/x86/kernel/smpboot.c | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8c1b017a8c1b..7079f47c653f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1481a3dd42c21ac4a8b9497cb9f5df816d6b064f +refs/heads/master: 7f6cbc905ee22c457e0dcd0bba9d4affbc290a6f diff --git a/trunk/arch/x86/kernel/setup64.c b/trunk/arch/x86/kernel/setup64.c index 70ff07186772..151d3155ddf6 100644 --- a/trunk/arch/x86/kernel/setup64.c +++ b/trunk/arch/x86/kernel/setup64.c @@ -247,6 +247,7 @@ void __cpuinit cpu_init (void) BUG(); enter_lazy_tlb(&init_mm, me); + load_sp0(t, ¤t->thread); set_tss_desc(cpu, t); load_TR_desc(); load_LDT(&init_mm.context); diff --git a/trunk/arch/x86/kernel/smpboot.c b/trunk/arch/x86/kernel/smpboot.c index 67af727f733a..3b48d1f4c7c3 100644 --- a/trunk/arch/x86/kernel/smpboot.c +++ b/trunk/arch/x86/kernel/smpboot.c @@ -864,7 +864,6 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu) 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);