diff --git a/[refs] b/[refs]
index e5d088d2fd4e..de3c48653adb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c969ffe1f1bb349e118a299f76f6bb0bbd6b05a
+refs/heads/master: 6f78a19702574008bbd333237380fa85be1c9e5d
diff --git a/trunk/include/asm-sparc64/vio.h b/trunk/include/asm-sparc64/vio.h
index f7417e91b170..d4de32f0f8af 100644
--- a/trunk/include/asm-sparc64/vio.h
+++ b/trunk/include/asm-sparc64/vio.h
@@ -8,6 +8,7 @@
 #include <linux/spinlock.h>
 #include <linux/completion.h>
 #include <linux/list.h>
+#include <linux/log2.h>
 
 #include <asm/ldc.h>
 #include <asm/mdesc.h>
@@ -257,8 +258,7 @@ static inline void *vio_dring_entry(struct vio_dring_state *dr,
 static inline u32 vio_dring_avail(struct vio_dring_state *dr,
 				  unsigned int ring_size)
 {
-	/* Ensure build-time power-of-2.  */
-	BUILD_BUG_ON(ring_size & (ring_size - 1));
+	BUILD_BUG_ON(!is_power_of_2(ring_size));
 
 	return (dr->pending -
 		((dr->prod - dr->cons) & (ring_size - 1)));