From 2344a8c33c0f7d4f2673bc4fb2e0c921c6b54e74 Mon Sep 17 00:00:00 2001 From: Borislav Petkov Date: Mon, 17 Dec 2007 00:30:22 +0100 Subject: [PATCH] --- yaml --- r: 82396 b: refs/heads/master c: 17b7a89cfb6ea2ff103785f9b2580e5138b6cfd1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/suspend_64.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 677d10a258bf..57d4dea4ac9c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b28f508112c584cdfbb4d8a9489cc4b79dac68ee +refs/heads/master: 17b7a89cfb6ea2ff103785f9b2580e5138b6cfd1 diff --git a/trunk/arch/x86/kernel/suspend_64.c b/trunk/arch/x86/kernel/suspend_64.c index 09199511c256..7ac7130022f1 100644 --- a/trunk/arch/x86/kernel/suspend_64.c +++ b/trunk/arch/x86/kernel/suspend_64.c @@ -140,7 +140,12 @@ static void fix_processor_context(void) int cpu = smp_processor_id(); struct tss_struct *t = &per_cpu(init_tss, cpu); - set_tss_desc(cpu,t); /* This just modifies memory; should not be necessary. But... This is necessary, because 386 hardware has concept of busy TSS or some similar stupidity. */ + /* + * This just modifies memory; should not be necessary. But... This + * is necessary, because 386 hardware has concept of busy TSS or some + * similar stupidity. + */ + set_tss_desc(cpu, t); get_cpu_gdt_table(cpu)[GDT_ENTRY_TSS].type = 9; @@ -160,7 +165,6 @@ static void fix_processor_context(void) loaddebug(¤t->thread, 6); loaddebug(¤t->thread, 7); } - } #ifdef CONFIG_HIBERNATION