diff -r f1ddc050d848 xen/common/gdbstub.c
--- a/xen/common/gdbstub.c	Thu Dec 21 20:44:35 2006 +0000
+++ b/xen/common/gdbstub.c	Fri Dec 22 09:51:42 2006 +0100
@@ -382,7 +382,7 @@ static int
 static int 
 process_command(struct cpu_user_regs *regs, struct gdb_context *ctx)
 {
-    char *ptr;
+    const char *ptr;
     unsigned long addr, length;
     int resume = 0;
 
diff -r f1ddc050d848 xen/include/asm-x86/bitops.h
--- a/xen/include/asm-x86/bitops.h	Thu Dec 21 20:44:35 2006 +0000
+++ b/xen/include/asm-x86/bitops.h	Fri Dec 22 09:48:48 2006 +0100
@@ -246,7 +246,7 @@ static __inline__ int constant_test_bit(
 	return ((1U << (nr & 31)) & (((const volatile unsigned int *) addr)[nr >> 5])) != 0;
 }
 
-static __inline__ int variable_test_bit(int nr, const volatile void * addr)
+static __inline__ int variable_test_bit(int nr, volatile void * addr)
 {
 	int oldbit;