From: Kyle McMartin <kyle@parisc-linux.org>
Date: Sun, 31 Dec 2006 00:24:37 +0000 (-0500)
Subject: [PARISC] use fls_long in irq.c
X-Git-Tag: v2.6.21-rc2~35^2~31
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0c2de3c6c481ba6a537f66c06a55bd5be5a2c99d;p=linux-2.6-omap-h63xx.git

[PARISC] use fls_long in irq.c


Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
---

diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c
index b39c5b9aff4..e9d09b020e8 100644
--- a/arch/parisc/kernel/irq.c
+++ b/arch/parisc/kernel/irq.c
@@ -336,11 +336,7 @@ unsigned int txn_alloc_data(unsigned int virt_irq)
 
 static inline int eirr_to_irq(unsigned long eirr)
 {
-#ifdef CONFIG_64BIT
-	int bit = fls64(eirr);
-#else
-	int bit = fls(eirr);
-#endif
+	int bit = fls_long(eirr);
 	return (BITS_PER_LONG - bit) + TIMER_IRQ;
 }