From 2bfb55e92082af4aace44485cf32aad44c0f4392 Mon Sep 17 00:00:00 2001 From: Glauber Costa Date: Tue, 27 May 2008 20:14:51 -0700 Subject: [PATCH] --- yaml --- r: 99847 b: refs/heads/master c: 736f12bff9d9e7b4e895c64f73b190c8383fc2a1 h: refs/heads/master i: 99845: 8e0769e7559c04c0f6a6da4108c2f8a8ae384ff5 99843: 3675335a5de7fe0220616bee58972e7d85517dc2 99839: 68d3e0580f0322dc4f736346c60dd4bac328d24a v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/traps_32.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3ee4686f7a60..d91f24c3b786 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9cf4f298e29abba25c16679fe7be70898223167e +refs/heads/master: 736f12bff9d9e7b4e895c64f73b190c8383fc2a1 diff --git a/trunk/arch/x86/kernel/traps_32.c b/trunk/arch/x86/kernel/traps_32.c index cf37d20b1ba7..dc7c05e5cfe7 100644 --- a/trunk/arch/x86/kernel/traps_32.c +++ b/trunk/arch/x86/kernel/traps_32.c @@ -1119,7 +1119,7 @@ void do_spurious_interrupt_bug(struct pt_regs *regs, long error_code) unsigned long patch_espfix_desc(unsigned long uesp, unsigned long kesp) { - struct desc_struct *gdt = __get_cpu_var(gdt_page).gdt; + struct desc_struct *gdt = get_cpu_gdt_table(smp_processor_id()); unsigned long base = (kesp - uesp) & -THREAD_SIZE; unsigned long new_kesp = kesp - base; unsigned long lim_pages = (new_kesp | (THREAD_SIZE - 1)) >> PAGE_SHIFT;