Commit dd951843 authored by Anton Blanchard's avatar Anton Blanchard

Merge samba.org:/home/anton/ppc64/for-linus-ppc64

into samba.org:/home/anton/ppc64/for-linus-ppc64_tmp
parents 2bed9c56 b8c3b554
...@@ -692,7 +692,12 @@ unsigned long get_wchan(struct task_struct *p); ...@@ -692,7 +692,12 @@ unsigned long get_wchan(struct task_struct *p);
#define KSTK_EIP(tsk) ((tsk)->thread.regs? (tsk)->thread.regs->nip: 0) #define KSTK_EIP(tsk) ((tsk)->thread.regs? (tsk)->thread.regs->nip: 0)
#define KSTK_ESP(tsk) ((tsk)->thread.regs? (tsk)->thread.regs->gpr[1]: 0) #define KSTK_ESP(tsk) ((tsk)->thread.regs? (tsk)->thread.regs->gpr[1]: 0)
/* XXX Temporary work around for a gcc 3.1 bug - Anton */
#if 0
#define cpu_relax() do { } while (0) #define cpu_relax() do { } while (0)
#else
#define cpu_relax() barrier()
#endif
/* /*
* Prefetch macros. * Prefetch macros.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment