Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97de50c0 authored by Jesper Juhl's avatar Jesper Juhl Committed by Linus Torvalds
Browse files

[PATCH] remove verify_area(): remove verify_area() from various uaccess.h headers 



Remove the deprecated (and unused) verify_area() from various uaccess.h
headers.

Signed-off-by: default avatarJesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5e5d7a22

arch/um/include/um_uaccess.h

+0 −7
Original line number Diff line number Diff line
@@ -20,13 +20,6 @@ 
#define access_ok(type, addr, size) \

	CHOOSE_MODE_PROC(access_ok_tt, access_ok_skas, type, addr, size)



/* this function will go away soon - use access_ok() instead */

static inline int __deprecated verify_area(int type, const void __user *addr, unsigned long size)

{

	return (CHOOSE_MODE_PROC(verify_area_tt, verify_area_skas, type, addr,

				size));

}



static inline int copy_from_user(void *to, const void __user *from, int n)

{

	return(CHOOSE_MODE_PROC(copy_from_user_tt, copy_from_user_skas, to,

include/asm-alpha/uaccess.h

+0 −6
Original line number Diff line number Diff line
@@ -48,12 +48,6 @@ 
	__access_ok(((unsigned long)(addr)),(size),get_fs());	\

})



/* this function will go away soon - use access_ok() instead */

extern inline int __deprecated verify_area(int type, const void __user * addr, unsigned long size)

{

	return access_ok(type,addr,size) ? 0 : -EFAULT;

}



/*

 * These are the main single-value transfer routines.  They automatically

 * use the right size if we just have the right pointer type.

include/asm-arm/uaccess.h

+0 −6
Original line number Diff line number Diff line
@@ -77,12 +77,6 @@ static inline void set_fs (mm_segment_t fs) 


#define access_ok(type,addr,size)	(__range_ok(addr,size) == 0)



/* this function will go away soon - use access_ok() instead */

static inline int __deprecated verify_area(int type, const void __user *addr, unsigned long size)

{

	return access_ok(type, addr, size) ? 0 : -EFAULT;

}



/*

 * Single-value transfer routines.  They automatically use the right

 * size if we just have the right pointer type.  Note that the functions

include/asm-arm26/uaccess.h

+0 −6
Original line number Diff line number Diff line
@@ -40,12 +40,6 @@ extern int fixup_exception(struct pt_regs *regs); 


#define access_ok(type,addr,size)	(__range_ok(addr,size) == 0)



/* this function will go away soon - use access_ok() instead */

static inline int __deprecated verify_area(int type, const void * addr, unsigned long size)

{

	return access_ok(type, addr, size) ? 0 : -EFAULT;

}



/*

 * Single-value transfer routines.  They automatically use the right

 * size if we just have the right pointer type.  Note that the functions

include/asm-cris/uaccess.h

+0 −7
Original line number Diff line number Diff line
@@ -91,13 +91,6 @@ 
#define __access_ok(addr,size) (__kernel_ok || __user_ok((addr),(size)))

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



/* this function will go away soon - use access_ok() instead */

extern inline int __deprecated verify_area(int type, const void __user * addr, unsigned long size)

{

	return access_ok(type,addr,size) ? 0 : -EFAULT;

}





#include <asm/arch/uaccess.h>



/*