Skip to content

Commit

Permalink
Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-u…
Browse files Browse the repository at this point in the history
…pstreaming

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
  • Loading branch information
torvalds committed Mar 9, 2012
2 parents 0cacaf5 + 4cd7c0a commit 0ab5d75
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/c6x/include/asm/processor.h
Expand Up @@ -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)

Expand Down

0 comments on commit 0ab5d75

Please sign in to comment.