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/kernel/sysfs.c | |
| parent | e432fe97f3e5de325b40021e505cce53877586c5 (diff) | |
| parent | 787c70f2f9990b5a197320152d2fc32cd8a6ad1a (diff) | |
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/kernel/sysfs.c')
| -rw-r--r-- | arch/powerpc/kernel/sysfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c index 5ff0e55d0db10..defecb3b1b15c 100644 --- a/arch/powerpc/kernel/sysfs.c +++ b/arch/powerpc/kernel/sysfs.c @@ -1167,7 +1167,7 @@ static int __init topology_init(void) * CPU. For instance, the boot cpu might never be valid * for hotplugging. */ - if (smp_ops->cpu_offline_self) + if (smp_ops && smp_ops->cpu_offline_self) c->hotpluggable = 1; #endif |