From: Lachlan McIlroy <lachlan@sgi.com>
Date: Tue, 26 Feb 2008 06:00:14 +0000 (+1100)
Subject: [XFS] Undo bit ops cleanup mod due to regression on 32-bit powermac
X-Git-Tag: v2.6.25-rc4~154^2~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db69c915e67705daac25cad06d816c09be634de0;p=linux-2.6

[XFS] Undo bit ops cleanup mod due to regression on 32-bit powermac
platform.

SGI-PV: 974005
SGI-Modid: xfs-linux-melb:xfs-kern:30558a

Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
---

diff --git a/fs/xfs/xfs_bit.h b/fs/xfs/xfs_bit.h
index 325a007dec..0f9fc9a3c4 100644
--- a/fs/xfs/xfs_bit.h
+++ b/fs/xfs/xfs_bit.h
@@ -61,15 +61,15 @@ static inline int xfs_highbit64(__uint64_t v)
 /* Get low bit set out of 32-bit argument, -1 if none set */
 static inline int xfs_lowbit32(__uint32_t v)
 {
-	__uint32_t t = v;
-	return (t) ? find_first_bit((unsigned long *)&t, 32) : -1;
+	unsigned long	t = v;
+	return (v) ? find_first_bit(&t, 32) : -1;
 }
 
 /* Get low bit set out of 64-bit argument, -1 if none set */
 static inline int xfs_lowbit64(__uint64_t v)
 {
-	__uint64_t t = v;
-	return (t) ? find_first_bit((unsigned long *)&t, 64) : -1;
+	unsigned long	t = v;
+	return (v) ? find_first_bit(&t, 64) : -1;
 }
 
 /* Return whether bitmap is empty (1 == empty) */