[PATCH] FPU context corrupted after resume (08967f94) · Commits · 戴 / test

mxcsr_feature_mask_init isn't needed in suspend/resume time (we can use boot time mask). And actually it's harmful, as it clear task's saved fxsave in resume. This bug is widely seen by users using zsh. (akpm: my eyes. Fixed some surrounding whitespace mess) Signed-off-by:

Shaohua <Li<shaohua.li@intel.com> Cc: Pavel Machek <pavel@ucw.cz> Cc: Andi Kleen <ak@muc.de> Signed-off-by:

Andrew Morton <akpm@osdl.org> Signed-off-by:

Linus Torvalds <torvalds@osdl.org>

arch/i386/power/cpu.c

+5 −7

Original line number	Diff line number	Diff line
		@@ -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 */
		/*
		* Restore FPU regs if necessary.
		*/
		kernel_fpu_end();
		mxcsr_feature_mask_init();
		}


		static void fix_processor_context(void)
		{
		int cpu = smp_processor_id();

arch/x86_64/kernel/suspend.c

+5 −6

Original line number	Diff line number	Diff line
		@@ -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 */
		/*
		* Restore FPU regs if necessary
		*/
		kernel_fpu_end();
		mxcsr_feature_mask_init();
		}

		void __restore_processor_state(struct saved_context *ctxt)

Admin message