diff options
author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2011-10-30 10:17:15 -0400 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2011-10-30 10:16:46 -0400 |
commit | 3c52e49d7c81434e3d2ccb520b3a654c2cc7d03d (patch) | |
tree | fee9f3d92204f6081e39481df5bb2dc4b038d9ea /arch/s390/lib | |
parent | 5b479a79bff752c6719463f093bdd191f4b837db (diff) |
[S390] sparse: fix sparse warnings with __user pointers
Use __force to quiet sparse warnings about user address space.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/lib')
-rw-r--r-- | arch/s390/lib/uaccess_pt.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/s390/lib/uaccess_pt.c b/arch/s390/lib/uaccess_pt.c index 74833831417f..342ae35a5ba9 100644 --- a/arch/s390/lib/uaccess_pt.c +++ b/arch/s390/lib/uaccess_pt.c | |||
@@ -342,7 +342,8 @@ int futex_atomic_op_pt(int op, u32 __user *uaddr, int oparg, int *old) | |||
342 | if (segment_eq(get_fs(), KERNEL_DS)) | 342 | if (segment_eq(get_fs(), KERNEL_DS)) |
343 | return __futex_atomic_op_pt(op, uaddr, oparg, old); | 343 | return __futex_atomic_op_pt(op, uaddr, oparg, old); |
344 | spin_lock(¤t->mm->page_table_lock); | 344 | spin_lock(¤t->mm->page_table_lock); |
345 | uaddr = (int __user *) __dat_user_addr((unsigned long) uaddr); | 345 | uaddr = (u32 __force __user *) |
346 | __dat_user_addr((__force unsigned long) uaddr); | ||
346 | if (!uaddr) { | 347 | if (!uaddr) { |
347 | spin_unlock(¤t->mm->page_table_lock); | 348 | spin_unlock(¤t->mm->page_table_lock); |
348 | return -EFAULT; | 349 | return -EFAULT; |
@@ -378,7 +379,8 @@ int futex_atomic_cmpxchg_pt(u32 *uval, u32 __user *uaddr, | |||
378 | if (segment_eq(get_fs(), KERNEL_DS)) | 379 | if (segment_eq(get_fs(), KERNEL_DS)) |
379 | return __futex_atomic_cmpxchg_pt(uval, uaddr, oldval, newval); | 380 | return __futex_atomic_cmpxchg_pt(uval, uaddr, oldval, newval); |
380 | spin_lock(¤t->mm->page_table_lock); | 381 | spin_lock(¤t->mm->page_table_lock); |
381 | uaddr = (int __user *) __dat_user_addr((unsigned long) uaddr); | 382 | uaddr = (u32 __force __user *) |
383 | __dat_user_addr((__force unsigned long) uaddr); | ||
382 | if (!uaddr) { | 384 | if (!uaddr) { |
383 | spin_unlock(¤t->mm->page_table_lock); | 385 | spin_unlock(¤t->mm->page_table_lock); |
384 | return -EFAULT; | 386 | return -EFAULT; |