bitkeeper revision 1.176 (3e9da47bzLFoU-B34fD8rTPJL639zw)

Merge scramble.cl.cam.ac.uk:/usr/groups/xeno/BK/xeno.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xeno

xenolinux-2.4.21-pre4-sparse/arch/xeno/kernel/traps.c

@@ -364,7 +364,7 @@ asmlinkage void do_debug(struct pt_regs * regs, long error_code)
     /* If this is a kernel mode trap, save the user PC on entry to 
      * the kernel, that's what the debugger can make sense of.
      */
-    info.si_addr = ((regs->xcs & 3) == 0) ? (void *)tsk->thread.eip : 
+    info.si_addr = ((regs->xcs & 2) == 0) ? (void *)tsk->thread.eip : 
                                             (void *)regs->eip;
     force_sig_info(SIGTRAP, &info, tsk);
 

xenolinux-2.4.21-pre4-sparse/include/asm-xeno/ptrace.h

@@ -55,7 +55,7 @@ struct pt_regs {
 #define PTRACE_O_TRACESYSGOOD     0x00000001
 
 #ifdef __KERNEL__
-#define user_mode(regs) ((regs) && (3 & (regs)->xcs))
+#define user_mode(regs) ((regs) && (2 & (regs)->xcs))
 #define instruction_pointer(regs) ((regs) ? (regs)->eip : NULL)
 extern void show_regs(struct pt_regs *);
 #endif