ARC: Fix build failures for ARCompact in linux-next after ARCv2 support

Reported-by: Guenter Roeck <private@roeck-us.net>
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>

diff --git a/arch/arc/Makefile b/arch/arc/Makefile
index e608e0759090102310b08b11c1faeeb645b71b12..6107062c01115dbea8a56e02bce254a8ba5b91af 100644 (file)
--- a/arch/arc/Makefile
+++ b/arch/arc/Makefile
@@ -15,8 +15,8 @@ endif
 KBUILD_DEFCONFIG := nsim_700_defconfig
 
 cflags-y       += -fno-common -pipe -fno-builtin -D__linux__
-cflags-${CONFIG_ISA_ARCOMPACT} += -mA7
-cflags-${CONFIG_ISA_ARCV2}     += -mcpu=archs
+cflags-$(CONFIG_ISA_ARCOMPACT) += -mA7
+cflags-$(CONFIG_ISA_ARCV2)     += -mcpu=archs
 
 ifdef CONFIG_ARC_CURR_IN_REG
 # For a global register defintion, make sure it gets passed to every file

diff --git a/arch/arc/kernel/process.c b/arch/arc/kernel/process.c
index 51560435a26bb26ac650d80626920720c82a3351..44092456776f8e9cd929b36e5083fbc4074dac9b 100644 (file)
--- a/arch/arc/kernel/process.c
+++ b/arch/arc/kernel/process.c
@@ -47,13 +47,7 @@ void arch_cpu_idle(void)
        if (is_isa_arcompact()) {
                __asm__("sleep 0x3");
        } else {
-               /* default irq priority (<=) which can interrupt the doze */
-               const int arg = 0x10 | ARCV2_IRQ_DEF_PRIO;
-
-               __asm__ __volatile__(
-               "sleep %0       \n"
-               :
-               :"r"(arg));
+               __asm__("sleep 0x10");
        }
 }