Commit a63a4931 authored by Martin Schwidefsky's avatar Martin Schwidefsky Committed by Linus Torvalds
Browse files

[PATCH] s390: uaccess warnings 



Convert __access_ok to an inline C function and change __get_user primitive to
avoid uaccess compiler warnings.

Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 56dc6a88

arch/s390/kernel/compat_linux.c

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ asmlinkage long sys32_getegid16(void) 


static inline long get_tv32(struct timeval *o, struct compat_timeval *i)

{

	return (!access_ok(VERIFY_READ, tv32, sizeof(*tv32)) ||

	return (!access_ok(VERIFY_READ, o, sizeof(*o)) ||

		(__get_user(o->tv_sec, &i->tv_sec) ||

		 __get_user(o->tv_usec, &i->tv_usec)));

}

include/asm-s390/uaccess.h

+8 −6
Original line number Diff line number Diff line
@@ -61,8 +61,10 @@ 
#define segment_eq(a,b) ((a).ar4 == (b).ar4)





#define __access_ok(addr,size) (1)



static inline int __access_ok(const void *addr, unsigned long size)

{

	return 1;

}

#define access_ok(type,addr,size) __access_ok(addr,size)



/*
@@ -206,25 +208,25 @@ extern int __put_user_bad(void) __attribute__((noreturn)); 
	case 1: {						\

		unsigned char __x;				\

		__get_user_asm(__x, ptr, __gu_err);		\

		(x) = (__typeof__(*(ptr))) __x;			\

		(x) = *(__typeof__(*(ptr)) *) &__x;		\

		break;						\

	};							\

	case 2: {						\

		unsigned short __x;				\

		__get_user_asm(__x, ptr, __gu_err);		\

		(x) = (__typeof__(*(ptr))) __x;			\

		(x) = *(__typeof__(*(ptr)) *) &__x;		\

		break;						\

	};							\

	case 4: {						\

		unsigned int __x;				\

		__get_user_asm(__x, ptr, __gu_err);		\

		(x) = (__typeof__(*(ptr))) __x;			\

		(x) = *(__typeof__(*(ptr)) *) &__x;		\

		break;						\

	};							\

	case 8: {						\

		unsigned long long __x;				\

		__get_user_asm(__x, ptr, __gu_err);		\

		(x) = (__typeof__(*(ptr))) __x;			\

		(x) = *(__typeof__(*(ptr)) *) &__x;		\

		break;						\

	};							\

	default:						\