Merge tag 'powerpc-4.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

[linux.git] / arch / powerpc / include / asm / uaccess.h

diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
index 51bfeb8777f065d843c0b0c1eb1cf910d7bbaaf3..a62ee663b2c834b22519ec1f88b6e557e8ac4f76 100644 (file)
--- a/arch/powerpc/include/asm/uaccess.h
+++ b/arch/powerpc/include/asm/uaccess.h
@@ -47,9 +47,13 @@
 
 #else
 
-#define __access_ok(addr, size, segment)       \
-       (((addr) <= (segment).seg) &&           \
-        (((size) == 0) || (((size) - 1) <= ((segment).seg - (addr)))))
+static inline int __access_ok(unsigned long addr, unsigned long size,
+                       mm_segment_t seg)
+{
+       if (addr > seg.seg)
+               return 0;
+       return (size == 0 || size - 1 <= seg.seg - addr);
+}
 
 #endif