Commit 3fb50075 authored by Al Viro's avatar Al Viro
Browse files

asm-generic/uaccess.h: don't mess with __copy_{to,from}_user 



only h8300 actually used those; might as well define them there.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent db68ce10

arch/c6x/include/asm/uaccess.h

+0 −3
Original line number Diff line number Diff line
@@ -94,9 +94,6 @@ static inline __must_check long __copy_to_user(void __user *to, 
	return 0;

}



#define __copy_to_user   __copy_to_user

#define __copy_from_user __copy_from_user



extern int _access_ok(unsigned long addr, unsigned long size);

#ifdef CONFIG_ACCESS_CHECK

#define __access_ok _access_ok

arch/h8300/include/asm/Kbuild

+0 −1
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ generic-y += tlbflush.h 
generic-y += trace_clock.h

generic-y += topology.h

generic-y += types.h

generic-y += uaccess.h

generic-y += ucontext.h

generic-y += unaligned.h

generic-y += vga.h

arch/h8300/include/asm/uaccess.h

0 → 100644
+52 −0
Original line number Diff line number Diff line 
#ifndef _ASM_UACCESS_H

#define _ASM_UACCESS_H



#include <linux/string.h>



static inline __must_check long __copy_from_user(void *to,

		const void __user * from, unsigned long n)

{

	if (__builtin_constant_p(n)) {

		switch(n) {

		case 1:

			*(u8 *)to = *(u8 __force *)from;

			return 0;

		case 2:

			*(u16 *)to = *(u16 __force *)from;

			return 0;

		case 4:

			*(u32 *)to = *(u32 __force *)from;

			return 0;

		}

	}



	memcpy(to, (const void __force *)from, n);

	return 0;

}



static inline __must_check long __copy_to_user(void __user *to,

		const void *from, unsigned long n)

{

	if (__builtin_constant_p(n)) {

		switch(n) {

		case 1:

			*(u8 __force *)to = *(u8 *)from;

			return 0;

		case 2:

			*(u16 __force *)to = *(u16 *)from;

			return 0;

		case 4:

			*(u32 __force *)to = *(u32 *)from;

			return 0;

		default:

			break;

		}

	}



	memcpy((void __force *)to, from, n);

	return 0;

}



#include <asm-generic/uaccess.h>



#endif

arch/um/include/asm/uaccess.h

+0 −2
Original line number Diff line number Diff line
@@ -31,8 +31,6 @@ static inline int __access_ok(unsigned long addr, unsigned long size); 
/* Teach asm-generic/uaccess.h that we have C functions for these. */

#define __access_ok __access_ok

#define __clear_user __clear_user

#define __copy_to_user __copy_to_user

#define __copy_from_user __copy_from_user

#define __strnlen_user __strnlen_user

#define __strncpy_from_user __strncpy_from_user

#define __copy_to_user_inatomic __copy_to_user

arch/unicore32/include/asm/uaccess.h

+0 −2
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@ 


#include <asm/memory.h>



#define __copy_from_user	__copy_from_user

#define __copy_to_user		__copy_to_user

#define __strncpy_from_user	__strncpy_from_user

#define __strnlen_user		__strnlen_user

#define __clear_user		__clear_user