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 git://git.infradead.org/battery-2.6
[pandora-kernel.git]
/
arch
/
m32r
/
kernel
/
signal.c
diff --git
a/arch/m32r/kernel/signal.c
b/arch/m32r/kernel/signal.c
index
916faf6
..
a753d79
100644
(file)
--- a/
arch/m32r/kernel/signal.c
+++ b/
arch/m32r/kernel/signal.c
@@
-358,7
+358,7
@@
int do_signal(struct pt_regs *regs, sigset_t *oldset)
signr = get_signal_to_deliver(&info, &ka, regs, NULL);
if (signr > 0) {
signr = get_signal_to_deliver(&info, &ka, regs, NULL);
if (signr > 0) {
- /* Reenable any watchpoints before delivering the
+ /* Re
-
enable any watchpoints before delivering the
* signal to user space. The processor register will
* have been cleared if the watchpoint triggered
* inside the kernel.
* signal to user space. The processor register will
* have been cleared if the watchpoint triggered
* inside the kernel.