From 4bb7e326900003abac4d84264a454cac36060b0b Mon Sep 17 00:00:00 2001
From: Akinobu Mita <mita@miraclelinux.com>
Date: Fri, 3 Feb 2006 03:03:46 -0800
Subject: [PATCH] --- yaml --- r: 19615 b: refs/heads/master c:
 f434baf4c6ae4a392b7c34843825af0894c89db2 h: refs/heads/master i:   19613:
 5cb4c11cd040ed86d1c4230862a7c4497d60c0e7   19611:
 d8e5ea991b9e52d155935c0daa4936da1e7dde93   19607:
 021412d5d41bfa2bc7cd48022f55e426fcb19ce6   19599:
 126624c98629fbb26aa21fa912e9f3acc8f0c093   19583:
 f695cbe9ff0fd5e820214a00eb435d1aecbc9492 v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/bitops.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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);
 }