Author: glen Date: Fri Mar 16 15:45:38 2012 GMT
Module: packages Tag: LINUX_2_6_27
---- Log message:
- revert ed6b9b97f42c091630335bfb71a2931e6f86388b to get BUG() working on alpha
---- Files affected:
packages/kernel:
kernel.spec (1.441.2.2036.2.69 -> 1.441.2.2036.2.70) , alpha-bug.patch (NONE
-> 1.1.2.1) (NEW)
---- Diffs:
================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.441.2.2036.2.69
packages/kernel/kernel.spec:1.441.2.2036.2.70
--- packages/kernel/kernel.spec:1.441.2.2036.2.69 Fri Mar 16 09:02:52 2012
+++ packages/kernel/kernel.spec Fri Mar 16 16:45:31 2012
@@ -326,6 +326,7 @@
Patch2001: linux-2.6.21.1-pwc-uncompress.patch
Patch2002: kernel-atom-coretemp.patch
Patch2003: kernel-regressions.patch
+Patch2004: alpha-bug.patch
# kill some thousands of warnings
# (only warnings, so just remove parts of this patch if conflics)
@@ -949,6 +950,7 @@
%patch2001 -p1
%patch2002 -p1
#%patch2003 -p1
+%patch2004 -p1
# Fix EXTRAVERSION in main Makefile
sed -i 's#EXTRAVERSION =.*#EXTRAVERSION =
%{postver}%{?alt_kernel:_%{alt_kernel}}#g' Makefile
@@ -1698,6 +1700,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.441.2.2036.2.70 2012/03/16 15:45:31 glen
+- revert ed6b9b97f42c091630335bfb71a2931e6f86388b to get BUG() working on alpha
+
Revision 1.441.2.2036.2.69 2012/03/16 08:02:52 glen
- builds now
================================================================
Index: packages/kernel/alpha-bug.patch
diff -u /dev/null packages/kernel/alpha-bug.patch:1.1.2.1
--- /dev/null Fri Mar 16 16:45:38 2012
+++ packages/kernel/alpha-bug.patch Fri Mar 16 16:45:31 2012
@@ -0,0 +1,44 @@
+try to fix alpha build:
+
+kernel-2.6.27.61/arch/alpha/include/asm/bug.h: In function
`unknown_bootoption':
+kernel-2.6.27.61/arch/alpha/include/asm/bug.h:13: warning: asm operand 1
probably doesn't match constraints
+kernel-2.6.27.61/arch/alpha/include/asm/bug.h:13: warning: asm operand 2
probably doesn't match constraints
+kernel-2.6.27.61/arch/alpha/include/asm/bug.h:13: error: impossible constraint
in `asm'
+kernel-2.6.27.61/arch/alpha/include/asm/bug.h: In function `__BUG':
+kernel-2.6.27.61/arch/alpha/include/asm/bug.h:13: warning: asm operand 1
probably doesn't match constraints
+kernel-2.6.27.61/arch/alpha/include/asm/bug.h:13: warning: asm operand 2
probably doesn't match constraints
+make[1]: *** [init/main.o] Error 1
+
+thus, reverting ed6b9b97f42c091630335bfb71a2931e6f86388b
+
+--- linux-2.6.27/arch/alpha/include/asm/bug.h~ 2012-03-16 09:24:29.000000000
+0000
++++ linux-2.6.27/arch/alpha/include/asm/bug.h 2012-03-16 09:24:35.000000000
+0000
+@@ -1,24 +1,14 @@
+ #ifndef _ALPHA_BUG_H
+ #define _ALPHA_BUG_H
+
+-#include <linux/linkage.h>
+-
+ #ifdef CONFIG_BUG
+ #include <asm/pal.h>
+
+ /* ??? Would be nice to use .gprel32 here, but we can't be sure that the
+- function loaded the GP, so this could fail in modules. */
+-static inline void ATTRIB_NORET __BUG(const char *file, int line)
+-{
+- __asm__ __volatile__(
+- "call_pal %0 # bugchk\n\t"
+- ".long %1\n\t.8byte %2"
+- : : "i" (PAL_bugchk), "i"(line), "i"(file));
+- for ( ; ; )
+- ;
+-}
+-
+-#define BUG() __BUG(__FILE__, __LINE__)
++ * function loaded the GP, so this could fail in modules. */
++#define BUG() \
++ __asm__ __volatile__("call_pal %0 # bugchk\n\t"".long %1\n\t.8byte
%2" \
++ : : "i" (PAL_bugchk),
"i"(__LINE__), "i"(__FILE__))
+
+ #define HAVE_ARCH_BUG
+ #endif
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.441.2.2036.2.69&r2=1.441.2.2036.2.70&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
