diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2021-09-03 22:54:12 +1000 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2021-09-03 22:54:12 +1000 |
commit | a3314262eede9c909a0c797f16f25f941d12c78d (patch) | |
tree | 4ec2b6857f839e9f4c86c9a08c9ccc4528ed0e9f /arch/powerpc/platforms/pseries | |
parent | e432fe97f3e5de325b40021e505cce53877586c5 (diff) | |
parent | 787c70f2f9990b5a197320152d2fc32cd8a6ad1a (diff) | |
download | linux-stable-a3314262eede9c909a0c797f16f25f941d12c78d.tar.gz linux-stable-a3314262eede9c909a0c797f16f25f941d12c78d.tar.bz2 linux-stable-a3314262eede9c909a0c797f16f25f941d12c78d.zip |
Merge branch 'fixes' into next
Merge our fixes branch into next.
That lets us resolve a conflict in arch/powerpc/sysdev/xive/common.c.
Between cbc06f051c52 ("powerpc/xive: Do not skip CPU-less nodes when
creating the IPIs"), which moved request_irq() out of xive_init_ipis(),
and 17df41fec5b8 ("powerpc: use IRQF_NO_DEBUG for IPIs") which added
IRQF_NO_DEBUG to that request_irq() call, which has now moved.
Diffstat (limited to 'arch/powerpc/platforms/pseries')
-rw-r--r-- | arch/powerpc/platforms/pseries/setup.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index 35724caf8a83..f79126f16258 100644 --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c @@ -77,7 +77,7 @@ #include "../../../../drivers/pci/pci.h" DEFINE_STATIC_KEY_FALSE(shared_processor); -EXPORT_SYMBOL_GPL(shared_processor); +EXPORT_SYMBOL(shared_processor); int CMO_PrPSP = -1; int CMO_SecPSP = -1; @@ -541,9 +541,10 @@ static void init_cpu_char_feature_flags(struct h_cpu_char_result *result) * H_CPU_BEHAV_FAVOUR_SECURITY_H could be set only if * H_CPU_BEHAV_FAVOUR_SECURITY is. */ - if (!(result->behaviour & H_CPU_BEHAV_FAVOUR_SECURITY)) + if (!(result->behaviour & H_CPU_BEHAV_FAVOUR_SECURITY)) { security_ftr_clear(SEC_FTR_FAVOUR_SECURITY); - else if (result->behaviour & H_CPU_BEHAV_FAVOUR_SECURITY_H) + pseries_security_flavor = 0; + } else if (result->behaviour & H_CPU_BEHAV_FAVOUR_SECURITY_H) pseries_security_flavor = 1; else pseries_security_flavor = 2; |