From 23ac090bb0ba5e372e8401e663181f54879ffbda Mon Sep 17 00:00:00 2001 From: William Lee Irwin III Date: Wed, 8 Jun 2005 15:48:52 -0700 Subject: [PATCH] --- yaml --- r: 1907 b: refs/heads/master c: f8acd944ea511af02485b1709c07ac7aac12aa48 h: refs/heads/master i: 1905: 775f4689cab00fff8fefa242906dbd1e704b1ca3 1903: 1830a351121a56c38e719eb4d083d64544025e2a v: v3 --- [refs] | 2 +- trunk/include/asm-sparc/uaccess.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 99a3cb4e0b81..a253d0bc3c4f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: beb9e1c3f32a0f878765c7c1142f91083739c5bd +refs/heads/master: f8acd944ea511af02485b1709c07ac7aac12aa48 diff --git a/trunk/include/asm-sparc/uaccess.h b/trunk/include/asm-sparc/uaccess.h index f461144067ee..0a780e84a12b 100644 --- a/trunk/include/asm-sparc/uaccess.h +++ b/trunk/include/asm-sparc/uaccess.h @@ -41,10 +41,11 @@ * No one can read/write anything from userland in the kernel space by setting * large size and address near to PAGE_OFFSET - a fault will break his intentions. */ -#define __user_ok(addr,size) ((addr) < STACK_TOP) +#define __user_ok(addr, size) ({ (void)(size); (addr) < STACK_TOP; }) #define __kernel_ok (segment_eq(get_fs(), KERNEL_DS)) #define __access_ok(addr,size) (__user_ok((addr) & get_fs().seg,(size))) -#define access_ok(type,addr,size) __access_ok((unsigned long)(addr),(size)) +#define access_ok(type, addr, size) \ + ({ (void)(type); __access_ok((unsigned long)(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)