Merge tag 'pci-v4.4-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

[firefly-linux-kernel-4.4.55.git] / arch / arc / include / asm / processor.h

diff --git a/arch/arc/include/asm/processor.h b/arch/arc/include/asm/processor.h
index 44545354e9e85616b703f531787ed74def265bf5..1d694c1ef6d6bf33ccb17745db6e58e816915875 100644 (file)
--- a/arch/arc/include/asm/processor.h
+++ b/arch/arc/include/asm/processor.h
@@ -57,11 +57,7 @@ struct task_struct;
  * A lot of busy-wait loops in SMP are based off of non-volatile data otherwise
  * get optimised away by gcc
  */
-#ifdef CONFIG_SMP
 #define cpu_relax()    __asm__ __volatile__ ("" : : : "memory")
-#else
-#define cpu_relax()    do { } while (0)
-#endif
 
 #define cpu_relax_lowlatency() cpu_relax()