git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
sparc
/
lib
/
copy_user.S
diff --git
a/arch/sparc/lib/copy_user.S
b/arch/sparc/lib/copy_user.S
index
577505b
..
ef095b6
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/ptrace.h>
#include <asm/asmmacro.h>
#include <asm/page.h>
+#include <asm/thread_info.h>
/* Work around cpp -rob */
#define ALLOC #alloc
/* Work around cpp -rob */
#define ALLOC #alloc
@@
-366,6
+367,9
@@
fixupretl:
blu 1f
cmp %o1, %g1
bgeu 1f
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
nop
save %sp, -64, %sp
mov %i0, %o0