diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-08-04 22:50:27 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-08-04 22:50:27 -0400 |
| commit | d932cb7e630cae3b6b5307b767d296ff1a597c5e (patch) | |
| tree | f930d068a12a256fabef0864bcdf8e85f095369e /include/asm-h8300/processor.h | |
| parent | 73b59a3b1c09e4bfc678400b77b96134dcfbf112 (diff) | |
| parent | f5d635f649607b09b0b4620d25d028fd2b1b7ea5 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'include/asm-h8300/processor.h')
| -rw-r--r-- | include/asm-h8300/processor.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-h8300/processor.h b/include/asm-h8300/processor.h index c7e2f454b83a..99b664aa2083 100644 --- a/include/asm-h8300/processor.h +++ b/include/asm-h8300/processor.h | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | */ | 17 | */ |
| 18 | #define current_text_addr() ({ __label__ _l; _l: &&_l;}) | 18 | #define current_text_addr() ({ __label__ _l; _l: &&_l;}) |
| 19 | 19 | ||
| 20 | #include <linux/compiler.h> | ||
| 20 | #include <asm/segment.h> | 21 | #include <asm/segment.h> |
| 21 | #include <asm/fpu.h> | 22 | #include <asm/fpu.h> |
| 22 | #include <asm/ptrace.h> | 23 | #include <asm/ptrace.h> |
| @@ -129,6 +130,6 @@ unsigned long get_wchan(struct task_struct *p); | |||
| 129 | eip; }) | 130 | eip; }) |
| 130 | #define KSTK_ESP(tsk) ((tsk) == current ? rdusp() : (tsk)->thread.usp) | 131 | #define KSTK_ESP(tsk) ((tsk) == current ? rdusp() : (tsk)->thread.usp) |
| 131 | 132 | ||
| 132 | #define cpu_relax() do { } while (0) | 133 | #define cpu_relax() barrier() |
| 133 | 134 | ||
| 134 | #endif | 135 | #endif |