diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-09 16:27:38 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-09 16:27:38 +0100 |
| commit | 0ab5d757db3beb865f52cb59fe4240c4fdc2da55 (patch) | |
| tree | dae37469dcfd4ff9055c326aa1f6a163f0e0a4e9 /arch | |
| parent | Merge tag 'iommu-fixes-v3.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | C6X: fix KSTK_EIP and KSTK_ESP macros (diff) | |
| download | linux-0ab5d757db3beb865f52cb59fe4240c4fdc2da55.tar.xz linux-0ab5d757db3beb865f52cb59fe4240c4fdc2da55.zip | |
Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming
Pull C6X fix from Mark Salter:
"Fix for C6X KSTK_EIP and KSTK_ESP macros."
* tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming:
C6X: fix KSTK_EIP and KSTK_ESP macros
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/c6x/include/asm/processor.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/c6x/include/asm/processor.h b/arch/c6x/include/asm/processor.h index 8154c4ee8c9c..77ecbded1f37 100644 --- a/arch/c6x/include/asm/processor.h +++ b/arch/c6x/include/asm/processor.h @@ -122,8 +122,8 @@ extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags); extern unsigned long get_wchan(struct task_struct *p); -#define KSTK_EIP(tsk) (task_pt_regs(task)->pc) -#define KSTK_ESP(tsk) (task_pt_regs(task)->sp) +#define KSTK_EIP(task) (task_pt_regs(task)->pc) +#define KSTK_ESP(task) (task_pt_regs(task)->sp) #define cpu_relax() do { } while (0) |