[kernel] r7710 - in dists/trunk/linux-2.6/debian: . patches/bugfix/alpha patches/series

[Steve Langasek]

Author: vorlon
Date: Tue Nov  7 12:01:17 2006
New Revision: 7710

Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/alpha/
   dists/trunk/linux-2.6/debian/patches/bugfix/alpha/asm-subarchs.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/5
Log:
[alpha] new asm-subarchs patch: tell the compiler that we're deliberately
emitting ev56 or ev6 instructions, so that this code will still compile
without having to cripple gcc-4.1's checking of whether the correct
instruction set is used.  Closes: #397139.



Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Tue Nov  7 12:01:17 2006
@@ -20,7 +20,13 @@
   [ Frederik Schüler ]
   * [i386] Acticate CONFIG_SX for all flavours. (closes: #391275)
 
- -- Frederik Schüler <fs at debian.org>  Tue,  7 Nov 2006 01:00:34 +0100
+  [ Steve Langasek ]
+  * [alpha] new asm-subarchs patch: tell the compiler that we're
+    deliberately emitting ev56 or ev6 instructions, so that this code
+    will still compile without having to cripple gcc-4.1's checking of
+    whether the correct instruction set is used.  Closes: #397139.
+
+ -- Steve Langasek <vorlon at debian.org>  Tue,  7 Nov 2006 02:57:56 -0800
 
 linux-2.6 (2.6.18-4) unstable; urgency=low
 

Added: dists/trunk/linux-2.6/debian/patches/bugfix/alpha/asm-subarchs.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/alpha/asm-subarchs.patch	Tue Nov  7 12:01:17 2006
@@ -0,0 +1,40 @@
+--- source/include/asm-alpha/compiler.h.orig	2006-09-19 20:42:06.000000000 -0700
++++ source/include/asm-alpha/compiler.h	2006-11-06 17:10:00.000000000 -0800
+@@ -78,16 +78,20 @@
+ #else
+ #define __kernel_ldbu(mem)				\
+   ({ unsigned char __kir;				\
+-     __asm__("ldbu %0,%1" : "=r"(__kir) : "m"(mem));	\
++     __asm__(".arch ev56;				\
++             ldbu %0,%1" : "=r"(__kir) : "m"(mem));	\
+      __kir; })
+ #define __kernel_ldwu(mem)				\
+   ({ unsigned short __kir;				\
+-     __asm__("ldwu %0,%1" : "=r"(__kir) : "m"(mem));	\
++     __asm__(".arch ev56;				\
++             ldwu %0,%1" : "=r"(__kir) : "m"(mem));	\
+      __kir; })
+-#define __kernel_stb(val,mem) \
+-  __asm__("stb %1,%0" : "=m"(mem) : "r"(val))
+-#define __kernel_stw(val,mem) \
+-  __asm__("stw %1,%0" : "=m"(mem) : "r"(val))
++#define __kernel_stb(val,mem)				\
++  __asm__(".arch ev56;					\
++          stb %1,%0" : "=m"(mem) : "r"(val))
++#define __kernel_stw(val,mem)				\
++  __asm__(".arch ev56;					\
++          stw %1,%0" : "=m"(mem) : "r"(val))
+ #endif
+ 
+ #ifdef __KERNEL__
+--- source/arch/alpha/kernel/sys_titan.c.orig	2006-11-06 23:17:50.000000000 -0800
++++ source/arch/alpha/kernel/sys_titan.c	2006-11-06 23:17:04.000000000 -0800
+@@ -257,7 +257,7 @@
+ 	 */
+ 	while (mask) {
+ 		/* convert to SRM vector... priority is <63> -> <0> */
+-		__asm__("ctlz %1, %0" : "=r"(vector) : "r"(mask));
++		__asm__(".arch ev6; ctlz %1, %0" : "=r"(vector) : "r"(mask));
+ 		vector = 63 - vector;
+ 		mask &= ~(1UL << vector);	/* clear it out 	 */
+ 		vector = 0x900 + (vector << 4);	/* convert to SRM vector */

Modified: dists/trunk/linux-2.6/debian/patches/series/5
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/5	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/5	Tue Nov  7 12:01:17 2006
@@ -3,3 +3,4 @@
 + bugfix/copy-user-highpage-2.patch
 - bugfix/ia64/sal-flush-fix.patch
 + bugfix/ia64/sal-flush-fix-upstream.patch
++ bugfix/alpha/asm-subarchs.patch