fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / include / asm-h8300 / processor.h

diff --git a/include/asm-h8300/processor.h b/include/asm-h8300/processor.h
index 5990073..99b664a 100644 (file)
--- a/include/asm-h8300/processor.h
+++ b/include/asm-h8300/processor.h
@@ -17,7 +17,7 @@
  */
 #define current_text_addr() ({ __label__ _l; _l: &&_l;})
 
-#include <linux/config.h>
+#include <linux/compiler.h>
 #include <asm/segment.h>
 #include <asm/fpu.h>
 #include <asm/ptrace.h>
@@ -45,11 +45,6 @@ static inline void wrusp(unsigned long usp) {
  */
 #define TASK_UNMAPPED_BASE     0
 
-/*
- * Bus types
- */
-#define MCA_bus 0
-
 struct thread_struct {
        unsigned long  ksp;             /* kernel stack pointer */
        unsigned long  usp;             /* user stack pointer */
@@ -135,6 +130,6 @@ unsigned long get_wchan(struct task_struct *p);
        eip; })
 #define        KSTK_ESP(tsk)   ((tsk) == current ? rdusp() : (tsk)->thread.usp)
 
-#define cpu_relax()    do { } while (0)
+#define cpu_relax()    barrier()
 
 #endif