diff --git a/[refs] b/[refs] index 355e7e7a43a3..2eabbad6ed16 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e2bebb4ae6d9ac4ffc524db67f7ecb205a173f77 +refs/heads/master: 9b76beb071be6fbfd0743feedfdd844f57d4f345 diff --git a/trunk/arch/openrisc/include/asm/processor.h b/trunk/arch/openrisc/include/asm/processor.h index 30462f1fe959..43decdbdb2ed 100644 --- a/trunk/arch/openrisc/include/asm/processor.h +++ b/trunk/arch/openrisc/include/asm/processor.h @@ -103,7 +103,7 @@ extern unsigned long thread_saved_pc(struct task_struct *t); #define init_stack (init_thread_union.stack) -#define cpu_relax() do { } while (0) +#define cpu_relax() barrier() #endif /* __ASSEMBLY__ */ #endif /* __ASM_OPENRISC_PROCESSOR_H */