Merge remote-tracking branch 'spi/fix/atmel' into spi-linus

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-shark / core.c

diff --git a/arch/arm/mach-shark/core.c b/arch/arm/mach-shark/core.c
index b63dec8481958c563b9e4a689b4bc488c7b7e175..153555724988b2264cefabdec1c9136435e1f7b4 100644 (file)
--- a/arch/arm/mach-shark/core.c
+++ b/arch/arm/mach-shark/core.c
@@ -10,6 +10,7 @@
 #include <linux/sched.h>
 #include <linux/serial_8250.h>
 #include <linux/io.h>
+#include <linux/cpu.h>
 
 #include <asm/setup.h>
 #include <asm/mach-types.h>
@@ -130,7 +131,7 @@ static void __init shark_timer_init(void)
 
 static void shark_init_early(void)
 {
-       disable_hlt();
+       cpu_idle_poll_ctrl(true);
 }
 
 MACHINE_START(SHARK, "Shark")