[kernel] r4928 - in dists/sid/linux-2.6/debian: . patches-debian patches-debian/series

[Dann Frazier]

Author: dannf
Date: Tue Nov 29 16:47:44 2005
New Revision: 4928

Added:
   dists/sid/linux-2.6/debian/patches-debian/ia64-new-assembler-fix.patch
   dists/sid/linux-2.6/debian/patches-debian/series/2.6.14-5
Modified:
   dists/sid/linux-2.6/debian/changelog
Log:
* ia64-new-assembler-fix.patch
  Fix ia64 builds with newer assembler (Closes: #341257)

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Tue Nov 29 16:47:44 2005
@@ -1,3 +1,10 @@
+linux-2.6 (2.6.14-5) UNRELEASED; urgency=low
+
+  * ia64-new-assembler-fix.patch
+    Fix ia64 builds with newer assembler (Closes: #341257)
+
+ -- dann frazier <dannf at debian.org>  Tue, 29 Nov 2005 09:30:32 -0700
+
 linux-2.6 (2.6.14-4) unstable; urgency=low
 
   [ dann frazier ]

Added: dists/sid/linux-2.6/debian/patches-debian/ia64-new-assembler-fix.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches-debian/ia64-new-assembler-fix.patch	Tue Nov 29 16:47:44 2005
@@ -0,0 +1,58 @@
+From: H. J. Lu <hjl at lucon.org>
+Date: Fri, 7 Oct 2005 18:01:19 +0000 (-0700)
+Subject:     [IA64] Fix 2.6 kernel for the new ia64 assembler
+X-Git-Tag: v2.6.14
+X-Git-Url: http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=9c184a073bfd650cc791956d6ca79725bb682716
+
+  [IA64] Fix 2.6 kernel for the new ia64 assembler
+  
+  The new ia64 assembler uses slot 1 for the offset of a long (2-slot)
+  instruction and the old assembler uses slot 2. The 2.6 kernel assumes
+  slot 2 and won't boot when the new assembler is used:
+  
+  http://sources.redhat.com/bugzilla/show_bug.cgi?id=1433
+  
+  This patch will work with either slot 1 or 2.
+  
+  Patch provided by H.J. Lu
+  
+  Signed-off-by: Tony Luck <tony.luck at intel.com>
+---
+
+--- a/arch/ia64/kernel/patch.c
++++ b/arch/ia64/kernel/patch.c
+@@ -64,22 +64,30 @@ ia64_patch (u64 insn_addr, u64 mask, u64
+ void
+ ia64_patch_imm64 (u64 insn_addr, u64 val)
+ {
+-	ia64_patch(insn_addr,
++	/* The assembler may generate offset pointing to either slot 1
++	   or slot 2 for a long (2-slot) instruction, occupying slots 1
++	   and 2.  */
++  	insn_addr &= -16UL;
++	ia64_patch(insn_addr + 2,
+ 		   0x01fffefe000UL, (  ((val & 0x8000000000000000UL) >> 27) /* bit 63 -> 36 */
+ 				     | ((val & 0x0000000000200000UL) <<  0) /* bit 21 -> 21 */
+ 				     | ((val & 0x00000000001f0000UL) <<  6) /* bit 16 -> 22 */
+ 				     | ((val & 0x000000000000ff80UL) << 20) /* bit  7 -> 27 */
+ 				     | ((val & 0x000000000000007fUL) << 13) /* bit  0 -> 13 */));
+-	ia64_patch(insn_addr - 1, 0x1ffffffffffUL, val >> 22);
++	ia64_patch(insn_addr + 1, 0x1ffffffffffUL, val >> 22);
+ }
+ 
+ void
+ ia64_patch_imm60 (u64 insn_addr, u64 val)
+ {
+-	ia64_patch(insn_addr,
++	/* The assembler may generate offset pointing to either slot 1
++	   or slot 2 for a long (2-slot) instruction, occupying slots 1
++	   and 2.  */
++  	insn_addr &= -16UL;
++	ia64_patch(insn_addr + 2,
+ 		   0x011ffffe000UL, (  ((val & 0x0800000000000000UL) >> 23) /* bit 59 -> 36 */
+ 				     | ((val & 0x00000000000fffffUL) << 13) /* bit  0 -> 13 */));
+-	ia64_patch(insn_addr - 1, 0x1fffffffffcUL, val >> 18);
++	ia64_patch(insn_addr + 1, 0x1fffffffffcUL, val >> 18);
+ }
+ 
+ /*

Added: dists/sid/linux-2.6/debian/patches-debian/series/2.6.14-5
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches-debian/series/2.6.14-5	Tue Nov 29 16:47:44 2005
@@ -0,0 +1 @@
++ ia64-new-assembler-fix.patch