linux-mips
[Top] [All Lists]

[PATCH 03/30] fix error: incompatiable argument type of clear_user

To: linux-mips@linux-mips.org, Ralf Baechle <ralf@linux-mips.org>
Subject: [PATCH 03/30] fix error: incompatiable argument type of clear_user
From: Wu Zhangjin <wuzhangjin@gmail.com>
Date: Sat, 16 May 2009 06:00:04 +0800
Cc: Arnaud Patard <apatard@mandriva.com>, loongson-dev@googlegroups.com, zhangfx@lemote.com, yanh@lemote.com, Philippe Vachon <philippe@cowpig.ca>, Zhang Le <r0bertz@gentoo.org>, Erwan Lerale <erwan@thiscow.com>
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:reply-to:to:cc :content-type:organization:date:message-id:mime-version:x-mailer :content-transfer-encoding; bh=ZZwgQsKcFy1enUDugO5kBVpoXZblkPYP33xmlafI/YU=; b=Wehcr/v5dmc/DMIoY0pON4DYgqPkebeELd2dx5OJnkOfCOd9Fpo6myxQM1fNivViGF IrxTFI2gHPRs0O4sneM9jPPfZWNsCa2Csf/AxMa77XWBuq9GK5bavKEMdN1P7TFdxqXV 8hCb95bY/J6ENPPAIOfZ2o/R/yAqbdN9BQ388=
Domainkey-signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:reply-to:to:cc:content-type:organization:date :message-id:mime-version:x-mailer:content-transfer-encoding; b=HdWTDU7NStgMo7ksFsLUrtARevSbGSrf1qWrzymzCq0SMxhjXdLa3xZQgGjb2PbfXI M+UqIFMEaT6Hr3MFayupU5S+lAuXkZ3mnmzadQpDEO2+sLq+gi4nAE65kCkXL/L74POS fhvLJN0AYvVhfraEY58P20w56Ldkl0WAgW1EU=
Organization: DSLab, Lanzhou University, China
Original-recipient: rfc822;linux-mips@linux-mips.org
Reply-to: wuzhangjin@gmail.com
Sender: linux-mips-bounce@linux-mips.org
>From c007d5f66af1b0134699644576f2d8994216057e Mon Sep 17 00:00:00 2001
From: Wu Zhangjin <wuzhangjin@gmail.com>
Date: Fri, 15 May 2009 20:36:20 +0800
Subject: [PATCH 03/30] fix error: incompatiable argument type of
clear_user

there are lots of warnings about the macro: clear_user in linux-mips.
in linux-2.6.29.3, it will come with errors, so, must be fixed.

the type of the second argument of access_ok should be (void __user *),
but there is an un-needed (unsigned long) conversion before __cl_addr,
so, remove the (unsigned long) will fix this problem.
---
 arch/mips/include/asm/uaccess.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/mips/include/asm/uaccess.h
b/arch/mips/include/asm/uaccess.h
index 42b9cec..cd32e9f 100644
--- a/arch/mips/include/asm/uaccess.h
+++ b/arch/mips/include/asm/uaccess.h
@@ -936,7 +936,7 @@ __clear_user(void __user *addr, __kernel_size_t
size)
        void __user * __cl_addr = (addr);                               \
        unsigned long __cl_size = (n);                                  \
        if (__cl_size && access_ok(VERIFY_WRITE,                        \
-               ((unsigned long)(__cl_addr)), __cl_size))               \
+                                       __cl_addr, __cl_size))          \
                __cl_size = __clear_user(__cl_addr, __cl_size);         \
        __cl_size;                                                      \
 })
-- 
1.6.2.1




<Prev in Thread] Current Thread [Next in Thread>
  • [PATCH 03/30] fix error: incompatiable argument type of clear_user, Wu Zhangjin <=