Merge branch 'blk-end-request' of git://git.kernel.dk/linux-2.6-block

[linux-2.6] / include / asm-alpha / ptrace.h

diff --git a/include/asm-alpha/ptrace.h b/include/asm-alpha/ptrace.h
index 994680b73a87be9a1fe43af80c99f4c9d7da835d..32c7a5cddd5909f68c60c1877bb0177f20204e88 100644 (file)
--- a/include/asm-alpha/ptrace.h
+++ b/include/asm-alpha/ptrace.h
@@ -68,17 +68,15 @@ struct switch_stack {
 
 #ifdef __KERNEL__
 
-#define __ARCH_SYS_PTRACE      1
-
 #define user_mode(regs) (((regs)->ps & 8) != 0)
 #define instruction_pointer(regs) ((regs)->pc)
 #define profile_pc(regs) instruction_pointer(regs)
 extern void show_regs(struct pt_regs *);
 
-#define alpha_task_regs(task) \
+#define task_pt_regs(task) \
   ((struct pt_regs *) (task_stack_page(task) + 2*PAGE_SIZE) - 1)
 
-#define force_successful_syscall_return() (alpha_task_regs(current)->r0 = 0)
+#define force_successful_syscall_return() (task_pt_regs(current)->r0 = 0)
 
 #endif