Merge tag 'fixes-nc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...
[~shefty/rdma-dev.git] / arch / arm / mach-orion5x / common.c
index e13d7732cfe96be25eb84142a67d0b2ea628ecba..2075bf8e3d90959784d27ff0b36bb423836c2711 100644 (file)
@@ -294,7 +294,7 @@ void __init orion5x_init(void)
         */
        if (dev == MV88F5281_DEV_ID && rev == MV88F5281_REV_D0) {
                printk(KERN_INFO "Orion: Applying 5281 D0 WFI workaround.\n");
-               disable_hlt();
+               cpu_idle_poll_ctrl(true);
        }
 
        /*