[kernel] r6655 - dists/sarge-security/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches

[Dann Frazier]

Author: dannf
Date: Sat May 20 17:48:48 2006
New Revision: 6655

Modified:
   dists/sarge-security/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/amd64-fp-reg-leak-dep3.dpatch

Log:
add missing hunk that was breaking x86 builds

Modified: dists/sarge-security/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/amd64-fp-reg-leak-dep3.dpatch
==============================================================================
--- dists/sarge-security/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/amd64-fp-reg-leak-dep3.dpatch	(original)
+++ dists/sarge-security/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/amd64-fp-reg-leak-dep3.dpatch	Sat May 20 17:48:48 2006
@@ -1,6 +1,27 @@
-diff -urN orig/include/asm-x86_64/system.h work/include/asm-x86_64/system.h
---- orig/include/asm-x86_64/system.h	2004-08-13 23:37:38.000000000 -0600
-+++ work/include/asm-x86_64/system.h	2006-05-17 20:27:51.000000000 -0600
+diff -Naru a/include/asm-i386/system.h b/include/asm-i386/system.h
+--- a/include/asm-i386/system.h	2006-05-20 18:40:25 -07:00
++++ b/include/asm-i386/system.h	2006-05-20 18:40:25 -07:00
+@@ -321,7 +321,7 @@
+  * If you use variable sized constraints like "m" or "g" in the 
+  * replacement maake sure to pad to the worst case length.
+  */
+-#define alternative_input(oldinstr, newinstr, feature, input)			\
++#define alternative_input(oldinstr, newinstr, feature, input...)		\
+ 	asm volatile ("661:\n\t" oldinstr "\n662:\n"				\
+ 		      ".section .altinstructions,\"a\"\n"			\
+ 		      "  .align 4\n"						\
+@@ -333,7 +333,7 @@
+ 		      ".previous\n"						\
+ 		      ".section .altinstr_replacement,\"ax\"\n"			\
+ 		      "663:\n\t" newinstr "\n664:\n"   /* replacement */ 	\
+-		      ".previous" :: "i" (feature), input)  
++		      ".previous" :: "i" (feature), ##input)
+ 
+ /*
+  * Force strict CPU ordering.
+diff -Naru a/include/asm-x86_64/system.h b/include/asm-x86_64/system.h
+--- a/include/asm-x86_64/system.h	2006-05-20 18:40:25 -07:00
++++ b/include/asm-x86_64/system.h	2006-05-20 18:40:25 -07:00
 @@ -123,7 +123,7 @@
   * If you use variable sized constraints like "m" or "g" in the 
   * replacement maake sure to pad to the worst case length.
@@ -19,3 +40,25 @@
  
  /*
   * Clear and set 'TS' bit respectively
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+#   2004/10/19 08:11:08-07:00 zwane at linuxpower.ca 
+#   [PATCH] Allow multiple inputs in alternative_input
+#   
+#   I had to use the following patch to allow multiple arguments to be passed
+#   down to the asm stub for alternative_input whilst writing alternatives for
+#   mwait code, it seems like a simple enough fix.
+#   
+#   Signed-off-by: Zwane Mwaikambo <zwane at linuxpower.ca>
+#   Signed-off-by: Andrew Morton <akpm at osdl.org>
+#   Signed-off-by: Linus Torvalds <torvalds at osdl.org>
+# 
+# include/asm-i386/system.h
+#   2004/10/19 02:40:26-07:00 zwane at linuxpower.ca +2 -2
+#   Allow multiple inputs in alternative_input
+# 
+# include/asm-x86_64/system.h
+#   2004/10/19 02:40:26-07:00 zwane at linuxpower.ca +2 -2
+#   Allow multiple inputs in alternative_input
+#