diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-07-27 14:27:06 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-07-27 14:27:06 -0400 |
| commit | 20f99dcf417a28089ef6c877ae97f5dec2eab435 (patch) | |
| tree | b4fe1f3e429d6a82ddaaa8e12899da630cfa8a63 /arch/s390/mm/fault.c | |
| parent | dd2f5538a157bda68bfa8efb39feaaccdda9e74e (diff) | |
| parent | 64821324ca49f24be1a66f2f432108f96a24e596 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'arch/s390/mm/fault.c')
| -rw-r--r-- | arch/s390/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c index 833d5941746a..7cd82575813d 100644 --- a/arch/s390/mm/fault.c +++ b/arch/s390/mm/fault.c | |||
| @@ -144,7 +144,7 @@ static void do_sigsegv(struct pt_regs *regs, unsigned long error_code, | |||
| 144 | #endif | 144 | #endif |
| 145 | si.si_signo = SIGSEGV; | 145 | si.si_signo = SIGSEGV; |
| 146 | si.si_code = si_code; | 146 | si.si_code = si_code; |
| 147 | si.si_addr = (void *) address; | 147 | si.si_addr = (void __user *) address; |
| 148 | force_sig_info(SIGSEGV, &si, current); | 148 | force_sig_info(SIGSEGV, &si, current); |
| 149 | } | 149 | } |
| 150 | 150 | ||