diff --git a/[refs] b/[refs]
index 066dc12aec07..adc718a1ec15 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9ab8b68e2abb1eff7ac0f8d118a8765130b967d
+refs/heads/master: f434baf4c6ae4a392b7c34843825af0894c89db2
diff --git a/trunk/include/linux/bitops.h b/trunk/include/linux/bitops.h
index 6a2a19f14bb2..208650b1ad3a 100644
--- a/trunk/include/linux/bitops.h
+++ b/trunk/include/linux/bitops.h
@@ -81,7 +81,7 @@ static inline int generic_fls64(__u64 x)
 {
 	__u32 h = x >> 32;
 	if (h)
-		return fls(x) + 32;
+		return fls(h) + 32;
 	return fls(x);
 }