Commit cfa0f29b authored by Al Viro's avatar Al Viro Committed by Linus Torvalds

[PATCH] cris: fix KSTK_EIP

cris KSTK_EIP looked for pt_regs at the right offset but from the wrong
place - forgotten ->thread_info
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 95ca0dc6
No related merge requests found
...@@ -40,7 +40,7 @@ struct thread_struct { ...@@ -40,7 +40,7 @@ struct thread_struct {
#define KSTK_EIP(tsk) \ #define KSTK_EIP(tsk) \
({ \ ({ \
unsigned long eip = 0; \ unsigned long eip = 0; \
unsigned long regs = (unsigned long)user_regs(tsk); \ unsigned long regs = (unsigned long)task_pt_regs(tsk); \
if (regs > PAGE_SIZE && \ if (regs > PAGE_SIZE && \
virt_addr_valid(regs)) \ virt_addr_valid(regs)) \
eip = ((struct pt_regs *)regs)->irp; \ eip = ((struct pt_regs *)regs)->irp; \
......
...@@ -36,7 +36,7 @@ struct thread_struct { ...@@ -36,7 +36,7 @@ struct thread_struct {
#define KSTK_EIP(tsk) \ #define KSTK_EIP(tsk) \
({ \ ({ \
unsigned long eip = 0; \ unsigned long eip = 0; \
unsigned long regs = (unsigned long)user_regs(tsk); \ unsigned long regs = (unsigned long)task_pt_regs(tsk); \
if (regs > PAGE_SIZE && virt_addr_valid(regs)) \ if (regs > PAGE_SIZE && virt_addr_valid(regs)) \
eip = ((struct pt_regs *)regs)->erp; \ eip = ((struct pt_regs *)regs)->erp; \
eip; \ eip; \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment