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
Merge to Fedora kernel-2.6.18-1.2255_FC5-vs2.0.2.2-rc9 patched with stable patch...
[linux-2.6.git]
/
arch
/
s390
/
kernel
/
compat_signal.c
diff --git
a/arch/s390/kernel/compat_signal.c
b/arch/s390/kernel/compat_signal.c
index
310d168
..
d49b876
100644
(file)
--- a/
arch/s390/kernel/compat_signal.c
+++ b/
arch/s390/kernel/compat_signal.c
@@
-28,7
+28,6
@@
#include <asm/ucontext.h>
#include <asm/uaccess.h>
#include <asm/lowcore.h>
#include <asm/ucontext.h>
#include <asm/uaccess.h>
#include <asm/lowcore.h>
-#include <linux/tracehook.h>
#include "compat_linux.h"
#include "compat_ptrace.h"
#include "compat_linux.h"
#include "compat_ptrace.h"
@@
-580,9
+579,7
@@
handle_signal32(unsigned long sig, struct k_sigaction *ka,
sigaddset(¤t->blocked,sig);
recalc_sigpending();
spin_unlock_irq(¤t->sighand->siglock);
sigaddset(¤t->blocked,sig);
recalc_sigpending();
spin_unlock_irq(¤t->sighand->siglock);
-
- tracehook_report_handle_signal(sig, ka, oldset, regs);
}
}
-
return ret;
}
return ret;
}
+