V4L/DVB (5818): CinergyT2: fix flush_workqueue() vs work->func() deadlock

[linux-2.6-omap-h63xx.git] / include / asm-sh / ptrace.h

diff --git a/include/asm-sh/ptrace.h b/include/asm-sh/ptrace.h
index 85aa0f4de819352a3db1ac316395517aae3c2374..ed358a376e6ea19ab31ef4fc14370dfe0a2003f8 100644 (file)
--- a/include/asm-sh/ptrace.h
+++ b/include/asm-sh/ptrace.h
@@ -1,8 +1,6 @@
 #ifndef __ASM_SH_PTRACE_H
 #define __ASM_SH_PTRACE_H
 
-#include <asm/ubc.h>
-
 /*
  * Copyright (C) 1999, 2000  Niibe Yutaka
  *
@@ -93,11 +91,11 @@ extern void show_regs(struct pt_regs *);
 
 #ifdef CONFIG_SH_DSP
 #define task_pt_regs(task) \
-       ((struct pt_regs *) ((unsigned long)(task)->thread_info + THREAD_SIZE \
+       ((struct pt_regs *) (task_stack_page(task) + THREAD_SIZE \
                 - sizeof(struct pt_dspregs) - sizeof(unsigned long)) - 1)
 #else
 #define task_pt_regs(task) \
-       ((struct pt_regs *) ((unsigned long)(task)->thread_info + THREAD_SIZE \
+       ((struct pt_regs *) (task_stack_page(task) + THREAD_SIZE \
                 - sizeof(unsigned long)) - 1)
 #endif