diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-12 08:30:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-12 08:30:57 -0700 |
| commit | b2d6744849b5bf6b4593b81c136772df7a238ac9 (patch) | |
| tree | f27260a0b16412449c4205207af114646c29e2c4 /arch/s390/mm/fault.c | |
| parent | c67646641cab01c93a56674bfcd963f55442dad5 (diff) | |
| parent | d2c993d845781d160a7ef759a3e65c6892c4a270 (diff) | |
| download | kernel-crypto-b2d6744849b5bf6b4593b81c136772df7a238ac9.tar.gz kernel-crypto-b2d6744849b5bf6b4593b81c136772df7a238ac9.tar.xz kernel-crypto-b2d6744849b5bf6b4593b81c136772df7a238ac9.zip | |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] Fix sparse warnings.
[S390] path grouping and path verifications fixes.
[S390] xpram module parameter parsing.
[S390] cpu_relax() is supposed to have barrier() semantics.
[S390] fix futex_atomic_cmpxchg_inatomic
[S390] subchannel register/unregister mutex.
[S390] raw_local_save_flags/raw_local_irq_restore type check
[S390] __builtin_trap() and gcc version.
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 833d5941746..7cd82575813 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, #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); } |