From 03fb699969752fbc1ec1011c76628e6f120b0710 Mon Sep 17 00:00:00 2001 From: Daniel Thompson Date: Thu, 19 Nov 2015 20:57:49 +0000 Subject: fixup! Look it up in a minute Signed-off-by: Daniel Thompson --- arch/arm64/kernel/smp.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'arch/arm64/kernel/smp.c') diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c index d6286a1e8d02..ca0bf862f905 100644 --- a/arch/arm64/kernel/smp.c +++ b/arch/arm64/kernel/smp.c @@ -345,6 +345,12 @@ void __init smp_prepare_boot_cpu(void) * and/or scheduling is enabled. */ apply_alternatives_early(); + + /* + * Conditionally switch to GIC PMR for interrupt masking (this + * will be a nop if we are using normal interrupt masking) + */ + maybe_switch_to_sysreg_cpuif(); } static u64 __init of_get_cpu_mpidr(struct device_node *dn) -- cgit v1.2.3