diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
| commit | 4bf311ddfbffe12d41ad1a3c311ab727db6f72cb (patch) | |
| tree | 9d19a2774e83637d86dc876f3af22af1dacf0bec /include/asm-v850/processor.h | |
| parent | 597d0cae0f99f62501e229bed50e8149604015bb (diff) | |
| parent | 82d6897fefca6206bca7153805b4c5359ce97fc4 (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/asm-v850/processor.h')
| -rw-r--r-- | include/asm-v850/processor.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-v850/processor.h b/include/asm-v850/processor.h index 6965b66ccaed..979e3467f9af 100644 --- a/include/asm-v850/processor.h +++ b/include/asm-v850/processor.h | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/thread_info.h> | 18 | #include <linux/thread_info.h> |
| 19 | #endif | 19 | #endif |
| 20 | 20 | ||
| 21 | #include <linux/compiler.h> | ||
| 21 | #include <asm/ptrace.h> | 22 | #include <asm/ptrace.h> |
| 22 | #include <asm/entry.h> | 23 | #include <asm/entry.h> |
| 23 | 24 | ||
| @@ -106,7 +107,7 @@ unsigned long get_wchan (struct task_struct *p); | |||
| 106 | #define KSTK_ESP(task) task_sp (task) | 107 | #define KSTK_ESP(task) task_sp (task) |
| 107 | 108 | ||
| 108 | 109 | ||
| 109 | #define cpu_relax() ((void)0) | 110 | #define cpu_relax() barrier() |
| 110 | 111 | ||
| 111 | 112 | ||
| 112 | #else /* __ASSEMBLY__ */ | 113 | #else /* __ASSEMBLY__ */ |