From 16eefd051b3e30e8ee1c2dc3208dd31b5c6aee3c Mon Sep 17 00:00:00 2001 From: Al Viro Date: Thu, 12 Jan 2006 01:06:04 -0800 Subject: [PATCH] --- yaml --- r: 18094 b: refs/heads/master c: cfa0f29b6da2c4d45ecdeaabe17af4c4adc47c05 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-cris/arch-v10/processor.h | 2 +- trunk/include/asm-cris/arch-v32/processor.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7cfc5bd78790..8ff059124e99 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 95ca0dc603ab58f3e4c5a1c23f675bd1f5b5fef3 +refs/heads/master: cfa0f29b6da2c4d45ecdeaabe17af4c4adc47c05 diff --git a/trunk/include/asm-cris/arch-v10/processor.h b/trunk/include/asm-cris/arch-v10/processor.h index e23df8dc96e8..cc692c7a0660 100644 --- a/trunk/include/asm-cris/arch-v10/processor.h +++ b/trunk/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/trunk/include/asm-cris/arch-v32/processor.h b/trunk/include/asm-cris/arch-v32/processor.h index 8c939bf27987..32bf2e538ced 100644 --- a/trunk/include/asm-cris/arch-v32/processor.h +++ b/trunk/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; \