From 93ae4cd8be2650b0092c50e7f4b3923308274309 Mon Sep 17 00:00:00 2001 From: Shaohua Li Date: Sun, 30 Oct 2005 14:59:28 -0800 Subject: [PATCH] --- yaml --- r: 11753 b: refs/heads/master c: 08967f941ad897b2f7c2f99e886c75d6319e5087 h: refs/heads/master i: 11751: 5bc0b7fd9102bcdb9836c6371a64f6b81a64776f v: v3 --- [refs] | 2 +- trunk/arch/i386/power/cpu.c | 12 +++++------- trunk/arch/x86_64/kernel/suspend.c | 11 +++++------ 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index 5b7b8b38e52b..55498687fb63 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8896fab35e62aa748a5ce62ac773508e51f10be1 +refs/heads/master: 08967f941ad897b2f7c2f99e886c75d6319e5087 diff --git a/trunk/arch/i386/power/cpu.c b/trunk/arch/i386/power/cpu.c index b27c5acc79d0..1f1572692e0b 100644 --- a/trunk/arch/i386/power/cpu.c +++ b/trunk/arch/i386/power/cpu.c @@ -51,16 +51,14 @@ void save_processor_state(void) __save_processor_state(&saved_context); } -static void -do_fpu_end(void) +static void do_fpu_end(void) { - /* restore FPU regs if necessary */ - /* Do it out of line so that gcc does not move cr0 load to some stupid place */ - kernel_fpu_end(); - mxcsr_feature_mask_init(); + /* + * Restore FPU regs if necessary. + */ + kernel_fpu_end(); } - static void fix_processor_context(void) { int cpu = smp_processor_id(); diff --git a/trunk/arch/x86_64/kernel/suspend.c b/trunk/arch/x86_64/kernel/suspend.c index f066c6ab3618..02516823f514 100644 --- a/trunk/arch/x86_64/kernel/suspend.c +++ b/trunk/arch/x86_64/kernel/suspend.c @@ -63,13 +63,12 @@ void save_processor_state(void) __save_processor_state(&saved_context); } -static void -do_fpu_end(void) +static void do_fpu_end(void) { - /* restore FPU regs if necessary */ - /* Do it out of line so that gcc does not move cr0 load to some stupid place */ - kernel_fpu_end(); - mxcsr_feature_mask_init(); + /* + * Restore FPU regs if necessary + */ + kernel_fpu_end(); } void __restore_processor_state(struct saved_context *ctxt)