diff options
author | Daniel Thompson <daniel.thompson@linaro.org> | 2015-11-19 20:57:49 +0000 |
---|---|---|
committer | Daniel Thompson <daniel.thompson@linaro.org> | 2015-11-19 20:57:49 +0000 |
commit | 03fb699969752fbc1ec1011c76628e6f120b0710 (patch) | |
tree | 504c7c7419476a49b0d38e1c2798c25af488cbde /arch/arm64/kernel | |
parent | 300cbaf6d3d49ca64c4d78998f6995a5edfc0218 (diff) |
fixup! Look it up in a minute
Signed-off-by: Daniel Thompson <daniel.thompson@linaro.org>
Diffstat (limited to 'arch/arm64/kernel')
-rw-r--r-- | arch/arm64/kernel/smp.c | 6 |
1 files changed, 6 insertions, 0 deletions
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) |