diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-09 07:27:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-09 07:27:38 -0800 |
| commit | 0ab5d757db3beb865f52cb59fe4240c4fdc2da55 (patch) | |
| tree | dae37469dcfd4ff9055c326aa1f6a163f0e0a4e9 | |
| parent | 0cacaf51a0b3092fc84e5c8d483721baee67b60f (diff) | |
| parent | 4cd7c0a03ea44ef88fa0d3901d671798d23cbc35 (diff) | |
| download | linux-3.10-0ab5d757db3beb865f52cb59fe4240c4fdc2da55.tar.gz linux-3.10-0ab5d757db3beb865f52cb59fe4240c4fdc2da55.tar.bz2 linux-3.10-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
| -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 8154c4ee8c9..77ecbded1f3 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) |