From 8a66c19caecba893709e5fe0806a96f096adea92 Mon Sep 17 00:00:00 2001
From: Chuck Lever <chuck.lever@oracle.com>
Date: Wed, 17 Oct 2007 18:04:38 +0200
Subject: [PATCH] --- yaml --- r: 70995 b: refs/heads/master c:
 d2ccc3fdde1a860b970109ad78865b7e44d3fc0c h: refs/heads/master i:   70993:
 901c7e6b9f04f671119ce9c6a775da37e4f0c19b   70991:
 29d6e8e77619974d2dc4f6a01627e44f13b2d90b v: v3

---
 [refs]                            | 2 +-
 trunk/include/asm-x86/bitops_64.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b5585819f6e2..2549af2ca822 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92b2dc79c3bb3f08afae6c0feaeea593b9c83a76
+refs/heads/master: d2ccc3fdde1a860b970109ad78865b7e44d3fc0c
diff --git a/trunk/include/asm-x86/bitops_64.h b/trunk/include/asm-x86/bitops_64.h
index d4dbbe5f7bd9..1d7d9b4bcacb 100644
--- a/trunk/include/asm-x86/bitops_64.h
+++ b/trunk/include/asm-x86/bitops_64.h
@@ -260,7 +260,7 @@ extern long find_first_bit(const unsigned long * addr, unsigned long size);
 extern long find_next_bit(const unsigned long * addr, long size, long offset);
 
 /* return index of first bet set in val or max when no bit is set */
-static inline unsigned long __scanbit(unsigned long val, unsigned long max)
+static inline long __scanbit(unsigned long val, unsigned long max)
 {
 	asm("bsfq %1,%0 ; cmovz %2,%0" : "=&r" (val) : "r" (val), "r" (max));
 	return val;