diff --git a/[refs] b/[refs] index fdfa793a593c..7a4716438547 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a5d361fc24b75ea51e219367ee32c64422a2134f +refs/heads/master: 35efbcabdc217f2b3a73bf3b895559e8f269e258 diff --git a/trunk/include/asm-m68k/uaccess.h b/trunk/include/asm-m68k/uaccess.h index a653bf80b848..2ffd87b0a769 100644 --- a/trunk/include/asm-m68k/uaccess.h +++ b/trunk/include/asm-m68k/uaccess.h @@ -805,7 +805,7 @@ static inline long strnlen_user(const char __user *src, long n) { long res; - res = -(long)src; + res = -(unsigned long)src; __asm__ __volatile__ ("1:\n" " tstl %2\n"