diff options
| author | Vineet Gupta <vgupta@synopsys.com> | 2015-06-28 20:22:01 +0530 |
|---|---|---|
| committer | Vineet Gupta <vgupta@synopsys.com> | 2015-06-28 20:30:13 +0530 |
| commit | 40b8ad8f762cae4c44852ee1736ba766f52d5cc3 (patch) | |
| tree | 515e7a14fbb7122f042519fb0e6fe351112417fe | |
| parent | d1c6c2fbcda341c583a9277c36404d24bb773140 (diff) | |
| download | op-kernel-dev-40b8ad8f762cae4c44852ee1736ba766f52d5cc3.zip op-kernel-dev-40b8ad8f762cae4c44852ee1736ba766f52d5cc3.tar.gz | |
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/Makefile | 4 | ||||
| -rw-r--r-- | arch/arc/kernel/process.c | 8 |
2 files changed, 3 insertions, 9 deletions
diff --git a/arch/arc/Makefile b/arch/arc/Makefile index e608e07..6107062 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 5156043..4409245 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"); } } |
