Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64...

[linux-2.6-block.git] / arch / arm64 / kernel / process.c

diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c
index 9856395ccdb708aea9608f79624abe829e671e11..6a869d9f304f73f4e6d91f52e5c4ac446fc9bf1a 100644 (file)
--- a/arch/arm64/kernel/process.c
+++ b/arch/arm64/kernel/process.c
@@ -83,7 +83,7 @@ static void __cpu_do_idle_irqprio(void)
         * be raised.
         */
        pmr = gic_read_pmr();
-       gic_write_pmr(GIC_PRIO_IRQON);
+       gic_write_pmr(GIC_PRIO_IRQON | GIC_PRIO_PSR_I_SET);
 
        __cpu_do_idle();