r4286 - dists/sid/linux-2.6/debian/patches-arch

[Sven Luther]

Author: luther
Date: 2005-09-26 14:24:23 +0000 (Mon, 26 Sep 2005)
New Revision: 4286

Modified:
   dists/sid/linux-2.6/debian/patches-arch/hppa.diff
Log:
Added willy's patch to unbreak other hppa flavours.


Modified: dists/sid/linux-2.6/debian/patches-arch/hppa.diff
===================================================================
--- dists/sid/linux-2.6/debian/patches-arch/hppa.diff	2005-09-26 12:44:08 UTC (rev 4285)
+++ dists/sid/linux-2.6/debian/patches-arch/hppa.diff	2005-09-26 14:24:23 UTC (rev 4286)
@@ -10851,3 +10851,28 @@
 +#define AD_CHAN_SYN	0x0008
 +
 +#endif /* __AD1889_H__ */
+===================================================================
+RCS file: /var/lib/cvs/linux-2.6/arch/parisc/lib/fixup.S,v
+retrieving revision 1.2
+retrieving revision 1.3
+diff -u -r1.2 -r1.3
+--- linux-2.6/arch/parisc/lib/fixup.S	2005/09/14 12:54:54	1.2
++++ linux-2.6/arch/parisc/lib/fixup.S	2005/09/26 01:23:05	1.3
+@@ -35,7 +35,7 @@
+ 	extrd,u \t2,63,32,\t2
+ #endif
+ 	/* t2 = &__per_cpu_offset[smp_processor_id()]; */
+-	LDREG,s \t2(\t1),\t2 
++	LDREGX \t2(\t1),\t2 
+ 	addil LT%per_cpu__exception_data,%r27
+ 	LDREG RT%per_cpu__exception_data(%r1),\t1
+ 	/* t1 = &__get_cpu_var(exception_data) */
+@@ -53,6 +53,8 @@
+ 	.endm
+ #endif
+ 
++	.level LEVEL
++
+ 	.text
+ 	.section .fixup, "ax"
+