diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2006-01-12 01:06:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 09:08:58 -0800 |
| commit | cfa0f29b6da2c4d45ecdeaabe17af4c4adc47c05 (patch) | |
| tree | b510b043f7762f6bd3089065310015ad96f8b65c /include/asm-cris | |
| parent | 95ca0dc603ab58f3e4c5a1c23f675bd1f5b5fef3 (diff) | |
| download | linux-stable-cfa0f29b6da2c4d45ecdeaabe17af4c4adc47c05.tar.gz linux-stable-cfa0f29b6da2c4d45ecdeaabe17af4c4adc47c05.tar.bz2 linux-stable-cfa0f29b6da2c4d45ecdeaabe17af4c4adc47c05.zip | |
[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: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-cris')
| -rw-r--r-- | include/asm-cris/arch-v10/processor.h | 2 | ||||
| -rw-r--r-- | include/asm-cris/arch-v32/processor.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-cris/arch-v10/processor.h b/include/asm-cris/arch-v10/processor.h index e23df8dc96e8..cc692c7a0660 100644 --- a/include/asm-cris/arch-v10/processor.h +++ b/include/asm-cris/arch-v10/processor.h @@ -40,7 +40,7 @@ struct thread_struct { #define KSTK_EIP(tsk) \ ({ \ 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)) \ eip = ((struct pt_regs *)regs)->irp; \ diff --git a/include/asm-cris/arch-v32/processor.h b/include/asm-cris/arch-v32/processor.h index 8c939bf27987..32bf2e538ced 100644 --- a/include/asm-cris/arch-v32/processor.h +++ b/include/asm-cris/arch-v32/processor.h @@ -36,7 +36,7 @@ struct thread_struct { #define KSTK_EIP(tsk) \ ({ \ 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)) \ eip = ((struct pt_regs *)regs)->erp; \ eip; \ |