From a153ff4cccfd73b7f413b5ced6bee1a7c8ea6b97 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Fri, 30 Sep 2005 03:29:05 +0100 Subject: [PATCH] --- yaml --- r: 9474 b: refs/heads/master c: 4735885701d7c24ed54f35f5102d32b3aabee55e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-um/uaccess.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d57346fc9783..871d7fdd3a2a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eacaa1f5aa4a41a48349f55abcd9258506943e76 +refs/heads/master: 4735885701d7c24ed54f35f5102d32b3aabee55e diff --git a/trunk/include/asm-um/uaccess.h b/trunk/include/asm-um/uaccess.h index 801710d00a40..2ee028b8de9d 100644 --- a/trunk/include/asm-um/uaccess.h +++ b/trunk/include/asm-um/uaccess.h @@ -44,7 +44,7 @@ const __typeof__(ptr) __private_ptr = ptr; \ __typeof__(*(__private_ptr)) __private_val; \ int __private_ret = -EFAULT; \ - (x) = 0; \ + (x) = (__typeof__(*(__private_ptr)))0; \ if (__copy_from_user(&__private_val, (__private_ptr), \ sizeof(*(__private_ptr))) == 0) {\ (x) = (__typeof__(*(__private_ptr))) __private_val; \