From: Vineet Gupta <vgupta@synopsys.com>
Date: Sun, 28 Jun 2015 14:52:01 +0000 (+0530)
Subject: ARC: Fix build failures for ARCompact in linux-next after ARCv2 support
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=40b8ad8f762cae4c44852ee1736ba766f52d5cc3;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

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 e608e0759090..6107062c0111 100644
--- 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 51560435a26b..44092456776f 100644
--- 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");
 	}
 }