projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
x86, vm86: fix preemption bug
[linux-2.6-block.git]
/
arch
/
m32r
/
kernel
/
entry.S
diff --git
a/arch/m32r/kernel/entry.S
b/arch/m32r/kernel/entry.S
index d4eaa2fd1818fea9b90e7c8bbdbe2bd7757ca99b..612d35b082a6826d59dda272612df7d295fa2e8c 100644
(file)
--- a/
arch/m32r/kernel/entry.S
+++ b/
arch/m32r/kernel/entry.S
@@
-143,7
+143,7
@@
ret_from_intr:
and3 r4, r4, #0x8000 ; check BSM bit
#endif
beqz r4, resume_kernel
-ENTRY(resume_userspace)
+resume_userspace:
DISABLE_INTERRUPTS(r4) ; make sure we don't miss an interrupt
; setting need_resched or sigpending
; between sampling and the iret