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.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
s390
/
mm
/
fault.c
diff --git
a/arch/s390/mm/fault.c
b/arch/s390/mm/fault.c
index
81ade40
..
7cd8257
100644
(file)
--- a/
arch/s390/mm/fault.c
+++ b/
arch/s390/mm/fault.c
@@
-10,7
+10,6
@@
* Copyright (C) 1995 Linus Torvalds
*/
* Copyright (C) 1995 Linus Torvalds
*/
-#include <linux/config.h>
#include <linux/signal.h>
#include <linux/sched.h>
#include <linux/kernel.h>
#include <linux/signal.h>
#include <linux/sched.h>
#include <linux/kernel.h>
@@
-145,7
+144,7
@@
static void do_sigsegv(struct pt_regs *regs, unsigned long error_code,
#endif
si.si_signo = SIGSEGV;
si.si_code = si_code;
#endif
si.si_signo = SIGSEGV;
si.si_code = si_code;
- si.si_addr = (void *) address;
+ si.si_addr = (void
__user
*) address;
force_sig_info(SIGSEGV, &si, current);
}
force_sig_info(SIGSEGV, &si, current);
}