Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae6578fe authored by Chuck Ebbert's avatar Chuck Ebbert Committed by Linus Torvalds
Browse files

[PATCH] i386: clean up user_mode macros 



 - make the new user_mode() return 0 or 1 (same as x86_64)

 - remove conditional jump from user_mode_vm() it's called every timer
   tick on each CPU on SMP)

Signed-off-by: default avatarChuck Ebbert <76306.1226@compuserve.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4d7de66e

include/asm-i386/ptrace.h

+10 −3
Original line number Original line Diff line number Diff line
@@ -57,14 +57,21 @@ struct pt_regs { 
#ifdef __KERNEL__

#ifdef __KERNEL__

struct task_struct;

struct task_struct;

extern void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs, int error_code);

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)

#define instruction_pointer(regs) ((regs)->eip)

#if defined(CONFIG_SMP) && defined(CONFIG_FRAME_POINTER)

#if defined(CONFIG_SMP) && defined(CONFIG_FRAME_POINTER)

extern unsigned long profile_pc(struct pt_regs *regs);

extern unsigned long profile_pc(struct pt_regs *regs);

#else

#else

#define profile_pc(regs) instruction_pointer(regs)

#define profile_pc(regs) instruction_pointer(regs)

#endif

#endif

#endif

#endif /* __KERNEL__ */





#endif
 
#endif