Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 5087
b: refs/heads/master
c: ae6578f
h: refs/heads/master
i:
  5085: 8701d2c
  5083: f25ce11
  5079: 344298f
  5071: 7ca250d
  5055: ffe914b
v: v3
  • Loading branch information
Chuck Ebbert authored and Linus Torvalds committed Jul 27, 2005
1 parent c75c86e commit ef6aa68
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4d7de66e2cc508761f050d1d4eaca88a6e6f711e
refs/heads/master: ae6578fe9b65208dee8eda40629984efd23740c4
13 changes: 10 additions & 3 deletions trunk/include/asm-i386/ptrace.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,21 @@ struct pt_regs {
#ifdef __KERNEL__
struct task_struct;
extern void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs, int error_code);
#define user_mode(regs) (3 & (regs)->xcs)
#define user_mode_vm(regs) ((VM_MASK & (regs)->eflags) || user_mode(regs))

static inline int user_mode(struct pt_regs *regs)
{
return (regs->xcs & 3) != 0;
}
static inline int user_mode_vm(struct pt_regs *regs)
{
return ((regs->xcs & 3) | (regs->eflags & VM_MASK)) != 0;
}
#define instruction_pointer(regs) ((regs)->eip)
#if defined(CONFIG_SMP) && defined(CONFIG_FRAME_POINTER)
extern unsigned long profile_pc(struct pt_regs *regs);
#else
#define profile_pc(regs) instruction_pointer(regs)
#endif
#endif
#endif /* __KERNEL__ */

#endif

0 comments on commit ef6aa68

Please sign in to comment.