diff --git a/[refs] b/[refs]
index 0e26ed0798f8..8472959a43e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4668f0cd0abd41a908ec7aa292e91fd158e0c8f8
+refs/heads/master: 3156054b02e263387d6cd27fd1b05eba2bc25459
diff --git a/trunk/include/asm-parisc/bitops.h b/trunk/include/asm-parisc/bitops.h
index 15d8c2b51584..ca6119af20af 100644
--- a/trunk/include/asm-parisc/bitops.h
+++ b/trunk/include/asm-parisc/bitops.h
@@ -220,7 +220,7 @@ static __inline__ unsigned long __ffs(unsigned long x)
 }
 
 /* Undefined if no bit is zero. */
-#define ffz(x)	__ffs(~x)
+#define ffz(x)	__ffs(~(x))
 
 /*
  * ffs: find first bit set. returns 1 to BITS_PER_LONG or 0 (if none set)