x86: printk kernel version in WARN_ON and other dump_stack users

[linux-2.6] / arch / sparc / lib / copy_user.S

diff --git a/arch/sparc/lib/copy_user.S b/arch/sparc/lib/copy_user.S
index 577505b692ae0643b046223187d071de9106f618..ef095b6c43b157dc7ad076b641893b59e25775de 100644 (file)
--- a/arch/sparc/lib/copy_user.S
+++ b/arch/sparc/lib/copy_user.S
@@ -14,6 +14,7 @@
 #include <asm/ptrace.h>
 #include <asm/asmmacro.h>
 #include <asm/page.h>
+#include <asm/thread_info.h>
 
 /* Work around cpp -rob */
 #define ALLOC #alloc
@@ -366,6 +367,9 @@ fixupretl:
        blu     1f
         cmp    %o1, %g1
        bgeu    1f
+        ld     [%g6 + TI_PREEMPT], %g1
+       cmp     %g1, 0
+       bne     1f
         nop
        save    %sp, -64, %sp
        mov     %i0, %o0