git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
arch
/
m68knommu
/
kernel
/
entry.S
diff --git
a/arch/m68knommu/kernel/entry.S
b/arch/m68knommu/kernel/entry.S
index
56043ad
..
aff6f57
100644
(file)
--- a/
arch/m68knommu/kernel/entry.S
+++ b/
arch/m68knommu/kernel/entry.S
@@
-145,6
+145,6
@@
ENTRY(ret_from_user_signal)
trap #0
ENTRY(ret_from_user_rt_signal)
- move #__NR_rt_sigreturn,%d0
+ move
l
#__NR_rt_sigreturn,%d0
trap #0