diff options
| author | kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> | 2003-04-16 18:44:11 +0000 |
|---|---|---|
| committer | kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> | 2003-04-16 18:44:11 +0000 |
| commit | ddbb5431fdecfef31a70c810b52b6145ce05a6d5 (patch) | |
| tree | cfe3aa4563d9601dada18d7d62a07237f77d530f /xenolinux-2.4.21-pre4-sparse | |
| parent | 4bf2a8db38d11698a421f49e0c6a6b2f73ca3735 (diff) | |
| parent | fd934d30b5781bdbebab1b3f724296855d9df0a1 (diff) | |
| download | xen-ddbb5431fdecfef31a70c810b52b6145ce05a6d5.tar.gz xen-ddbb5431fdecfef31a70c810b52b6145ce05a6d5.tar.bz2 xen-ddbb5431fdecfef31a70c810b52b6145ce05a6d5.zip | |
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
Diffstat (limited to 'xenolinux-2.4.21-pre4-sparse')
| -rw-r--r-- | xenolinux-2.4.21-pre4-sparse/arch/xeno/kernel/traps.c | 2 | ||||
| -rw-r--r-- | xenolinux-2.4.21-pre4-sparse/include/asm-xeno/ptrace.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xenolinux-2.4.21-pre4-sparse/arch/xeno/kernel/traps.c b/xenolinux-2.4.21-pre4-sparse/arch/xeno/kernel/traps.c index a10c07a0ae..c218067d2a 100644 --- a/xenolinux-2.4.21-pre4-sparse/arch/xeno/kernel/traps.c +++ b/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); diff --git a/xenolinux-2.4.21-pre4-sparse/include/asm-xeno/ptrace.h b/xenolinux-2.4.21-pre4-sparse/include/asm-xeno/ptrace.h index 83a1115ed6..4457ac0b17 100644 --- a/xenolinux-2.4.21-pre4-sparse/include/asm-xeno/ptrace.h +++ b/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 |