diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-05-29 05:54:52 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-05-29 05:54:52 +0200 |
| commit | 435462c6e639065460e91903d6bd2af0f5762fde (patch) | |
| tree | bf66ccdd613019035ebab535762366aa1026399b /arch/mips/include | |
| parent | powerpc/pci: clean up direct access to sysdata by iseries platform (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vap... (diff) | |
| download | linux-435462c6e639065460e91903d6bd2af0f5762fde.tar.xz linux-435462c6e639065460e91903d6bd2af0f5762fde.zip | |
Merge branch 'merge' into next
Diffstat (limited to 'arch/mips/include')
| -rw-r--r-- | 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 8de858f5449f..c2d53c18fd36 100644 --- a/arch/mips/include/asm/uaccess.h +++ b/arch/mips/include/asm/uaccess.h @@ -956,7 +956,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; \ }) |