From: William Lee Irwin III Minor gaffe on my part: Signed-off-by: Andrew Morton --- 25-akpm/include/asm-ia64/ptrace.h | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff -puN include/asm-ia64/ptrace.h~profile_pc-fix include/asm-ia64/ptrace.h --- 25/include/asm-ia64/ptrace.h~profile_pc-fix Thu Aug 5 14:36:20 2004 +++ 25-akpm/include/asm-ia64/ptrace.h Thu Aug 5 14:36:20 2004 @@ -232,11 +232,11 @@ struct switch_stack { /* Conserve space in histogram by encoding slot bits in address * bits 2 and 3 rather than bits 0 and 1. */ -static inline unsigned long profile_pc(struct pt_regs *regs) -{ - unsigned long ip = instruction_pointer(regs); - return (ip & ~3UL) + ((ip & 3UL) << 2); -} +#define profile_pc(regs) \ +({ \ + unsigned long __ip = instruction_pointer(regs); \ + (__ip & ~3UL) + ((__ip & 3UL) << 2); \ +}) /* given a pointer to a task_struct, return the user's pt_regs */ # define ia64_task_regs(t) (((struct pt_regs *) ((char *) (t) + IA64_STK_OFFSET)) - 1) _