[S390] Get rid of a lot of sparse warnings.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:

committed by
Martin Schwidefsky

parent
55dff5224a
commit
2b67fc4606
@@ -13,6 +13,7 @@
|
||||
#include <linux/mm.h>
|
||||
#include <linux/uaccess.h>
|
||||
#include <asm/futex.h>
|
||||
#include "uaccess.h"
|
||||
|
||||
#ifndef __s390x__
|
||||
#define AHI "ahi"
|
||||
@@ -28,9 +29,6 @@
|
||||
#define SLR "slgr"
|
||||
#endif
|
||||
|
||||
extern size_t copy_from_user_pt(size_t n, const void __user *from, void *to);
|
||||
extern size_t copy_to_user_pt(size_t n, void __user *to, const void *from);
|
||||
|
||||
size_t copy_from_user_std(size_t size, const void __user *ptr, void *x)
|
||||
{
|
||||
unsigned long tmp1, tmp2;
|
||||
@@ -72,7 +70,8 @@ size_t copy_from_user_std(size_t size, const void __user *ptr, void *x)
|
||||
return size;
|
||||
}
|
||||
|
||||
size_t copy_from_user_std_check(size_t size, const void __user *ptr, void *x)
|
||||
static size_t copy_from_user_std_check(size_t size, const void __user *ptr,
|
||||
void *x)
|
||||
{
|
||||
if (size <= 1024)
|
||||
return copy_from_user_std(size, ptr, x);
|
||||
@@ -110,14 +109,16 @@ size_t copy_to_user_std(size_t size, void __user *ptr, const void *x)
|
||||
return size;
|
||||
}
|
||||
|
||||
size_t copy_to_user_std_check(size_t size, void __user *ptr, const void *x)
|
||||
static size_t copy_to_user_std_check(size_t size, void __user *ptr,
|
||||
const void *x)
|
||||
{
|
||||
if (size <= 1024)
|
||||
return copy_to_user_std(size, ptr, x);
|
||||
return copy_to_user_pt(size, ptr, x);
|
||||
}
|
||||
|
||||
size_t copy_in_user_std(size_t size, void __user *to, const void __user *from)
|
||||
static size_t copy_in_user_std(size_t size, void __user *to,
|
||||
const void __user *from)
|
||||
{
|
||||
unsigned long tmp1;
|
||||
|
||||
@@ -148,7 +149,7 @@ size_t copy_in_user_std(size_t size, void __user *to, const void __user *from)
|
||||
return size;
|
||||
}
|
||||
|
||||
size_t clear_user_std(size_t size, void __user *to)
|
||||
static size_t clear_user_std(size_t size, void __user *to)
|
||||
{
|
||||
unsigned long tmp1, tmp2;
|
||||
|
||||
@@ -254,7 +255,7 @@ size_t strncpy_from_user_std(size_t size, const char __user *src, char *dst)
|
||||
: "0" (-EFAULT), "d" (oparg), "a" (uaddr), \
|
||||
"m" (*uaddr) : "cc");
|
||||
|
||||
int futex_atomic_op(int op, int __user *uaddr, int oparg, int *old)
|
||||
int futex_atomic_op_std(int op, int __user *uaddr, int oparg, int *old)
|
||||
{
|
||||
int oldval = 0, newval, ret;
|
||||
|
||||
@@ -286,7 +287,7 @@ int futex_atomic_op(int op, int __user *uaddr, int oparg, int *old)
|
||||
return ret;
|
||||
}
|
||||
|
||||
int futex_atomic_cmpxchg(int __user *uaddr, int oldval, int newval)
|
||||
int futex_atomic_cmpxchg_std(int __user *uaddr, int oldval, int newval)
|
||||
{
|
||||
int ret;
|
||||
|
||||
@@ -311,6 +312,6 @@ struct uaccess_ops uaccess_std = {
|
||||
.clear_user = clear_user_std,
|
||||
.strnlen_user = strnlen_user_std,
|
||||
.strncpy_from_user = strncpy_from_user_std,
|
||||
.futex_atomic_op = futex_atomic_op,
|
||||
.futex_atomic_cmpxchg = futex_atomic_cmpxchg,
|
||||
.futex_atomic_op = futex_atomic_op_std,
|
||||
.futex_atomic_cmpxchg = futex_atomic_cmpxchg_std,
|
||||
};
|
||||
|
Reference in New Issue
Block a user