[kernel] r12286 - in dists/sid/linux-2.6/debian: . patches/bugfix/x86 patches/series

[Bastian Blank]

Author: waldi
Date: Sun Oct  5 13:38:16 2008
New Revision: 12286

Log:
* debian/changelog: Update.
* debian/patches/bugfix/x86/restrict-long-nops.patch: Add.
* debian/patches/series/8: Add new patch.


Added:
   dists/sid/linux-2.6/debian/patches/bugfix/x86/restrict-long-nops.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/8

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Sun Oct  5 13:38:16 2008
@@ -1,7 +1,11 @@
 linux-2.6 (2.6.26-8) UNRELEASED; urgency=low
 
+  [ dann frazier ]
   * [x86] Fix broken LDT access in VMI (CVE-2008-4410)
 
+  [ Bastian Blank ]
+  * [i386] Restrict the usage of long NOPs.
+
  -- dann frazier <dannf at debian.org>  Fri, 03 Oct 2008 17:38:31 -0600
 
 linux-2.6 (2.6.26-7) unstable; urgency=low

Added: dists/sid/linux-2.6/debian/patches/bugfix/x86/restrict-long-nops.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/x86/restrict-long-nops.patch	Sun Oct  5 13:38:16 2008
@@ -0,0 +1,27 @@
+diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
+index 2c518fb..b225219 100644
+--- a/arch/x86/Kconfig.cpu
++++ b/arch/x86/Kconfig.cpu
+@@ -382,14 +382,17 @@ config X86_OOSTORE
+ # P6_NOPs are a relatively minor optimization that require a family >=
+ # 6 processor, except that it is broken on certain VIA chips.
+ # Furthermore, AMD chips prefer a totally different sequence of NOPs
+-# (which work on all CPUs).  As a result, disallow these if we're
+-# compiling X86_GENERIC but not X86_64 (these NOPs do work on all
+-# x86-64 capable chips); the list of processors in the right-hand clause
+-# are the cores that benefit from this optimization.
++# (which work on all CPUs).  In addition, it looks like Virtual PC
++# does not understand them.
++#
++# As a result, disallow these if we're not compiling for X86_64 (these
++# NOPs do work on all x86-64 capable chips); the list of processors in
++# the right-hand clause are the cores that benefit from this optimization.
+ #
+ config X86_P6_NOP
+ 	def_bool y
+-	depends on (X86_64 || !X86_GENERIC) && (M686 || MPENTIUMII || MPENTIUMIII || MPENTIUMM || MCORE2 || MPENTIUM4 || MPSC)
++	depends on X86_64
++	depends on (MCORE2 || MPENTIUM4 || MPSC)
+ 
+ config X86_TSC
+ 	def_bool y

Modified: dists/sid/linux-2.6/debian/patches/series/8
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/8	(original)
+++ dists/sid/linux-2.6/debian/patches/series/8	Sun Oct  5 13:38:16 2008
@@ -1 +1,2 @@
 + bugfix/x86/fix-broken-LDT-access-in-VMI.patch
++ bugfix/x86/restrict-long-nops.patch