delete a .26 patch that doesn't apply

diff --git a/queue-2.6.26/series b/queue-2.6.26/series
index a9985930cead3a9438061d7aa21bad33dbaf0223..3671761f532b709fd5a81c85252ec31120c1cadf 100644 (file)
--- a/queue-2.6.26/series
+++ b/queue-2.6.26/series
@@ -16,4 +16,3 @@ alsa-fix-locking-in-snd_pcm_open-and-snd_rawmidi_open.patch
 alsa-remove-unneeded-power_mutex-lock-in-snd_pcm_drop.patch
 kvm-svm-fix-random-segfaults-with-npt-enabled.patch
 kvm-svm-fix-guest-global-tlb-flushes-with-npt.patch
-x64-fpu-fix-possible-fpu-leakage-in-error-conditions.patch

diff --git a/queue-2.6.26/x64-fpu-fix-possible-fpu-leakage-in-error-conditions.patch b/queue-2.6.26/x64-fpu-fix-possible-fpu-leakage-in-error-conditions.patch
deleted file mode 100644 (file)
index b36c073..0000000
--- a/queue-2.6.26/x64-fpu-fix-possible-fpu-leakage-in-error-conditions.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From suresh.b.siddha@intel.com  Tue Sep 30 16:20:01 2008
-From: Suresh Siddha <suresh.b.siddha@intel.com>
-Date: Wed, 3 Sep 2008 11:57:06 -0700
-Subject: x64, fpu: fix possible FPU leakage in error conditions
-To: stable@kernel.org
-Cc: gregkh@suse.de
-Message-ID: <20080903185706.GG14481@linux-os.sc.intel.com>
-Content-Disposition: inline
-
-
-From: Suresh Siddha <suresh.b.siddha@intel.com>
-
-[Upstream commit: 6ffac1e90a17ea0aded5c581204397421eec91b6]
-
-On Thu, Jul 24, 2008 at 03:43:44PM -0700, Linus Torvalds wrote:
-> So how about this patch as a starting point? This is the RightThing(tm) to
-> do regardless, and if it then makes it easier to do some other cleanups,
-> we should do it first. What do you think?
-
-restore_fpu_checking() calls init_fpu() in error conditions.
-
-While this is wrong(as our main intention is to clear the fpu state of
-the thread), this was benign before commit 92d140e21f1 ("x86: fix taking
-DNA during 64bit sigreturn").
-
-Post commit 92d140e21f1, live FPU registers may not belong to this
-process at this error scenario.
-
-In the error condition for restore_fpu_checking() (especially during the
-64bit signal return), we are doing init_fpu(), which saves the live FPU
-register state (possibly belonging to some other process context) into
-the thread struct (through unlazy_fpu() in init_fpu()). This is wrong
-and can leak the FPU data.
-
-For the signal handler restore error condition in restore_i387(), clear
-the fpu state present in the thread struct(before ultimately sending a
-SIGSEGV for badframe).
-
-For the paranoid error condition check in math_state_restore(), send a
-SIGSEGV, if we fail to restore the state.
-
-Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
-Cc: Linus Torvalds <torvalds@linux-foundation.org>
-Signed-off-by: Ingo Molnar <mingo@elte.hu>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---- linux-2.6.26.2.orig/arch/x86/kernel/signal_64.c     2008-08-18 11:16:43.000000000 -0700
-+++ linux-2.6.26.2/arch/x86/kernel/signal_64.c  2008-08-18 11:16:50.000000000 -0700
-@@ -104,7 +104,16 @@
-                clts();
-                task_thread_info(current)->status |= TS_USEDFPU;
-        }
--       return restore_fpu_checking((__force struct i387_fxsave_struct *)buf);
-+       err = restore_fpu_checking((__force struct i387_fxsave_struct *)buf);
-+       if (unlikely(err)) {
-+               /*
-+                * Encountered an error while doing the restore from the
-+                * user buffer, clear the fpu state.
-+                */
-+               clear_fpu(tsk);
-+               clear_used_math();
-+       }
-+       return err;
- }
-
- /*
-Index: linux-2.6.26.2/arch/x86/kernel/traps_64.c
-===================================================================
---- linux-2.6.26.2.orig/arch/x86/kernel/traps_64.c      2008-08-06 09:19:01.000000000 -0700
-+++ linux-2.6.26.2/arch/x86/kernel/traps_64.c   2008-08-18 11:17:43.000000000 -0700
-@@ -1141,7 +1141,14 @@
-        }
-
-        clts();                 /* Allow maths ops (or we recurse) */
--       restore_fpu_checking(&me->thread.xstate->fxsave);
-+       /*
-+        * Paranoid restore. send a SIGSEGV if we fail to restore the state.
-+        */
-+       if (unlikely(restore_fpu_checking(&me->thread.xstate->fxsave))) {
-+               stts();
-+               force_sig(SIGSEGV, me);
-+               return;
-+       }
-        task_thread_info(me)->status |= TS_USEDFPU;
-        me->fpu_counter++;
- }
-Index: linux-2.6.26.2/include/asm-x86/i387.h
-===================================================================
---- linux-2.6.26.2.orig/include/asm-x86/i387.h  2008-08-18 11:16:43.000000000 -0700
-+++ linux-2.6.26.2/include/asm-x86/i387.h       2008-08-18 11:16:50.000000000 -0700
-@@ -62,8 +62,6 @@
- #else
-                     : [fx] "cdaSDb" (fx), "m" (*fx), "0" (0));
- #endif
--       if (unlikely(err))
--               init_fpu(current);
-        return err;
- }
-