浏览代码

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>
Vineet Gupta 10 年之前
父节点
当前提交
40b8ad8f76
共有 2 个文件被更改,包括 3 次插入9 次删除
  1. 2 2
      arch/arc/Makefile
  2. 1 7
      arch/arc/kernel/process.c

+ 2 - 2
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

+ 1 - 7
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");
 	}
 }