Index: 2006-08-16/xen/include/asm-x86/bitops.h
===================================================================
--- 2006-08-16.orig/xen/include/asm-x86/bitops.h	2006-06-28 15:52:35.000000000 +0200
+++ 2006-08-16/xen/include/asm-x86/bitops.h	2006-08-22 09:19:25.000000000 +0200
@@ -224,10 +224,10 @@ static __inline__ int test_and_change_bi
 
 static __inline__ int constant_test_bit(int nr, const volatile void * addr)
 {
-	return ((1UL << (nr & 31)) & (((const volatile unsigned int *) addr)[nr >> 5])) != 0;
+	return ((1U << (nr & 31)) & (((const volatile unsigned int *) addr)[nr >> 5])) != 0;
 }
 
-static __inline__ int variable_test_bit(int nr, volatile void * addr)
+static __inline__ int variable_test_bit(int nr, const volatile void * addr)
 {
 	int oldbit;