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 10:39:57 2006 +0100 @@ -253,7 +253,7 @@ static __inline__ int variable_test_bit( __asm__ __volatile__( "btl %2,%1\n\tsbbl %0,%0" :"=r" (oldbit) - :"m" (ADDR),"dIr" (nr)); + :"m" (*(const volatile long *)addr),"dIr" (nr)); return oldbit; }