aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVineet Gupta <vgupta@synopsys.com>2015-06-28 10:52:01 -0400
committerVineet Gupta <vgupta@synopsys.com>2015-06-28 11:00:13 -0400
commit40b8ad8f762cae4c44852ee1736ba766f52d5cc3 (patch)
tree515e7a14fbb7122f042519fb0e6fe351112417fe
parentd1c6c2fbcda341c583a9277c36404d24bb773140 (diff)
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>
-rw-r--r--arch/arc/Makefile4
-rw-r--r--arch/arc/kernel/process.c8
2 files changed, 3 insertions, 9 deletions
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
15KBUILD_DEFCONFIG := nsim_700_defconfig 15KBUILD_DEFCONFIG := nsim_700_defconfig
16 16
17cflags-y += -fno-common -pipe -fno-builtin -D__linux__ 17cflags-y += -fno-common -pipe -fno-builtin -D__linux__
18cflags-${CONFIG_ISA_ARCOMPACT} += -mA7 18cflags-$(CONFIG_ISA_ARCOMPACT) += -mA7
19cflags-${CONFIG_ISA_ARCV2} += -mcpu=archs 19cflags-$(CONFIG_ISA_ARCV2) += -mcpu=archs
20 20
21ifdef CONFIG_ARC_CURR_IN_REG 21ifdef CONFIG_ARC_CURR_IN_REG
22# For a global register defintion, make sure it gets passed to every file 22# 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)
47 if (is_isa_arcompact()) { 47 if (is_isa_arcompact()) {
48 __asm__("sleep 0x3"); 48 __asm__("sleep 0x3");
49 } else { 49 } else {
50 /* default irq priority (<=) which can interrupt the doze */ 50 __asm__("sleep 0x10");
51 const int arg = 0x10 | ARCV2_IRQ_DEF_PRIO;
52
53 __asm__ __volatile__(
54 "sleep %0 \n"
55 :
56 :"r"(arg));
57 } 51 }
58} 52}
59 53