From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 25 Dec 2008 10:50:41 +0000 (+0100)
Subject: Merge branches 'x86/pat2' and 'x86/fpu'; commit 'v2.6.28' into x86/core
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=79a66b96c339626a3e4b226fefc0e45244cfe6ff;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

Merge branches 'x86/pat2' and 'x86/fpu'; commit 'v2.6.28' into x86/core
---

79a66b96c339626a3e4b226fefc0e45244cfe6ff
diff --cc arch/x86/kernel/traps.c
index 73ece2633f47,04d242ab0161,f37cee75ab58,04d242ab0161..141907ab6e22
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@@@@ -684,15 -689,14 -688,15 -689,14 +684,15 @@@@@ void math_error(void __user *ip
    	 */
    	cwd = get_fpu_cwd(task);
    	swd = get_fpu_swd(task);
 - -	switch (swd & ~cwd & 0x3f) {
 - -	case 0x000: /* No unmasked exception */
 + +
 + +	err = swd & ~cwd & 0x3f;
 + +
-   #if CONFIG_X86_32
+   #ifdef CONFIG_X86_32
 + +	if (!err)
    		return;
    #endif
 - -	default: /* Multiple exceptions */
 - -		break;
 - -	case 0x001: /* Invalid Op */
 + +
 + +	if (err & 0x001) {	/* Invalid op */
    		/*
    		 * swd & 0x240 == 0x040: Stack Underflow
    		 * swd & 0x240 == 0x240: Stack Overflow