diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-07-06 13:45:24 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-07-06 13:45:24 -0400 |
| commit | a2262d8a231e92742651859a10c9a4430a5e899a (patch) | |
| tree | b5a823e3f6a3f60e1dd995f113caf0b350228d84 /arch/arm/include/asm/processor.h | |
| parent | ef06f55a5c936a395f3ee2e1237bbebdb4396c65 (diff) | |
| parent | 815c4163b6c8ebf8152f42b0a5fd015cfdcedc78 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'arch/arm/include/asm/processor.h')
| -rw-r--r-- | arch/arm/include/asm/processor.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/include/asm/processor.h b/arch/arm/include/asm/processor.h index 6a89567ffc5b..7bed3daf83b8 100644 --- a/arch/arm/include/asm/processor.h +++ b/arch/arm/include/asm/processor.h | |||
| @@ -91,7 +91,11 @@ extern void release_thread(struct task_struct *); | |||
| 91 | 91 | ||
| 92 | unsigned long get_wchan(struct task_struct *p); | 92 | unsigned long get_wchan(struct task_struct *p); |
| 93 | 93 | ||
| 94 | #if __LINUX_ARM_ARCH__ == 6 | ||
| 95 | #define cpu_relax() smp_mb() | ||
| 96 | #else | ||
| 94 | #define cpu_relax() barrier() | 97 | #define cpu_relax() barrier() |
| 98 | #endif | ||
| 95 | 99 | ||
| 96 | /* | 100 | /* |
| 97 | * Create a new kernel thread | 101 | * Create a new kernel thread |