X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=arch%2Fx86%2Finclude%2Fasm%2Fbitops.h;h=e02a359d2aa5c6bcbfb9c5465cfaa8f6bd79e007;hb=c4295fbb6048d85f0b41c5ced5cbf63f6811c46c;hp=9fa9dcdf344baeb25ccfa79db6222b5aae470ba5;hpb=e245b80c8357bf375f15c5f3b05ef8ae35e4fbc8;p=linux-2.6-omap-h63xx.git

diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
index 9fa9dcdf344..e02a359d2aa 100644
--- a/arch/x86/include/asm/bitops.h
+++ b/arch/x86/include/asm/bitops.h
@@ -300,7 +300,7 @@ static inline int test_and_change_bit(int nr, volatile unsigned long *addr)
 	return oldbit;
 }
 
-static inline int constant_test_bit(int nr, const volatile unsigned long *addr)
+static inline int constant_test_bit(unsigned int nr, const volatile unsigned long *addr)
 {
 	return ((1UL << (nr % BITS_PER_LONG)) &
 		(((unsigned long *)addr)[nr / BITS_PER_LONG])) != 0;