diff options
author | Tony Luck <tony.luck@intel.com> | 2005-09-08 23:27:13 +0200 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-09-08 23:27:13 +0200 |
commit | 344a076110f4ecb16ea6d286b63be696604982ed (patch) | |
tree | def6e229efdb6ee91b631b6695bf7f9ace8e2719 /include/asm-sh64/uaccess.h | |
parent | [IA64] Increase max physical address for SN platforms (diff) | |
parent | Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzi... (diff) | |
download | linux-344a076110f4ecb16ea6d286b63be696604982ed.tar.xz linux-344a076110f4ecb16ea6d286b63be696604982ed.zip |
[IA64] Manual merge fix for 3 files
arch/ia64/Kconfig
arch/ia64/kernel/acpi.c
include/asm-ia64/irq.h
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'include/asm-sh64/uaccess.h')
-rw-r--r-- | include/asm-sh64/uaccess.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/asm-sh64/uaccess.h b/include/asm-sh64/uaccess.h index a33654d576a1..56aa3cf0f273 100644 --- a/include/asm-sh64/uaccess.h +++ b/include/asm-sh64/uaccess.h @@ -60,12 +60,6 @@ #define access_ok(type,addr,size) (__range_ok(addr,size) == 0) #define __access_ok(addr,size) (__range_ok(addr,size) == 0) -/* 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; -} - /* * Uh, these should become the main single-value transfer routines ... * They automatically use the right size if we just have the right |