]> rtime.felk.cvut.cz Git - zynq/linux.git/commitdiff
powerpc: Drop use of 'type' from access_ok()
authorMathieu Malaterre <malat@debian.org>
Fri, 4 Jan 2019 09:27:58 +0000 (10:27 +0100)
committerMichael Ellerman <mpe@ellerman.id.au>
Fri, 4 Jan 2019 12:07:59 +0000 (23:07 +1100)
In commit 05a4ab823983 ("powerpc/uaccess: fix warning/error with
access_ok()") an attempt was made to remove a warning by referencing
the variable `type`. However in commit 96d4f267e40f ("Remove 'type'
argument from access_ok() function") the variable `type` has been
removed, breaking the build:

  arch/powerpc/include/asm/uaccess.h:66:32: error: ‘type’ undeclared (first use in this function)

This essentially reverts commit 05a4ab823983 ("powerpc/uaccess: fix
warning/error with access_ok()") to fix the error.

Fixes: 96d4f267e40f ("Remove 'type' argument from access_ok() function")
Signed-off-by: Mathieu Malaterre <malat@debian.org>
[mpe: Reword change log slightly.]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/include/asm/uaccess.h

index b31bf45eebd49ddce0c6fa46da8691ffb5a70bf1..5f0c98e511a0681d5b8566c462a21dc4721b2eb3 100644 (file)
@@ -63,7 +63,7 @@ static inline int __access_ok(unsigned long addr, unsigned long size,
 #endif
 
 #define access_ok(addr, size)          \
-       (__chk_user_ptr(addr), (void)(type),            \
+       (__chk_user_ptr(addr),                  \
         __access_ok((__force unsigned long)(addr), (size), get_fs()))
 
 /*