Merge branch 'hwpoison' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux...

[pandora-kernel.git] / include / linux / pagemap.h

diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
index a547d96..e12cdc6 100644 (file)
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
@@ -430,8 +430,10 @@ static inline int fault_in_pages_readable(const char __user *uaddr, int size)
                const char __user *end = uaddr + size - 1;
 
                if (((unsigned long)uaddr & PAGE_MASK) !=
                const char __user *end = uaddr + size - 1;
 
                if (((unsigned long)uaddr & PAGE_MASK) !=

-                               ((unsigned long)end & PAGE_MASK))
+                               ((unsigned long)end & PAGE_MASK)) {

                        ret = __get_user(c, end);
                        ret = __get_user(c, end);

+                       (void)c;
+               }

        }
        return ret;
 }
        }
        return ret;
 }