From c187234013e79cd61d40bd255e32fbb934965bb5 Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Thu, 1 Jan 2009 10:12:18 +1030
Subject: [PATCH] --- yaml --- r: 125685 b: refs/heads/master c:
 434ae514c23047db87a8bbf39cebc9e1767aea44 h: refs/heads/master i:   125683:
 4385a5b35dbc7450608f89bf8493f5150d939ebf v: v3

---
 [refs]                          | 2 +-
 trunk/include/asm-m68k/bitops.h | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2273e278cfb5..7ed9c9d686e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ccec25ff69d5f48c7a088c16fe2dc7e11d9e87fe
+refs/heads/master: 434ae514c23047db87a8bbf39cebc9e1767aea44
diff --git a/trunk/include/asm-m68k/bitops.h b/trunk/include/asm-m68k/bitops.h
index 3e8106442d5a..9bde784e7bad 100644
--- a/trunk/include/asm-m68k/bitops.h
+++ b/trunk/include/asm-m68k/bitops.h
@@ -315,6 +315,11 @@ static inline int fls(int x)
 	return 32 - cnt;
 }
 
+static inline int __fls(int x)
+{
+	return fls(x) - 1;
+}
+
 #include <asm-generic/bitops/fls64.h>
 #include <asm-generic/bitops/sched.h>
 #include <asm-generic/bitops/hweight.h>