projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
[linux-2.6-block.git]
/
include
/
asm-h8300
/
processor.h
diff --git
a/include/asm-h8300/processor.h
b/include/asm-h8300/processor.h
index c7e2f454b83a570b5a445b061f028705166637bb..99b664aa20837e3f1d674800bc9377932267802e 100644
(file)
--- a/
include/asm-h8300/processor.h
+++ b/
include/asm-h8300/processor.h
@@
-17,6
+17,7
@@
*/
#define current_text_addr() ({ __label__ _l; _l: &&_l;})
*/
#define current_text_addr() ({ __label__ _l; _l: &&_l;})
+#include <linux/compiler.h>
#include <asm/segment.h>
#include <asm/fpu.h>
#include <asm/ptrace.h>
#include <asm/segment.h>
#include <asm/fpu.h>
#include <asm/ptrace.h>
@@
-129,6
+130,6
@@
unsigned long get_wchan(struct task_struct *p);
eip; })
#define KSTK_ESP(tsk) ((tsk) == current ? rdusp() : (tsk)->thread.usp)
eip; })
#define KSTK_ESP(tsk) ((tsk) == current ? rdusp() : (tsk)->thread.usp)
-#define cpu_relax()
do { } while (0
)
+#define cpu_relax()
barrier(
)
#endif
#endif