diff options
author | Rakib Mullick <rakib.mullick@gmail.com> | 2017-11-01 00:14:51 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-11-01 04:56:39 -0400 |
commit | 10d94ff4d558b96bfc4f55bb0051ae4d938246fe (patch) | |
tree | 085380478ecf3b36877934d3161028312cc27c48 | |
parent | 16c0890dc66d258fdeccf7b15a133f3930b19143 (diff) |
irq/core: Fix boot crash when the irqaffinity= boot parameter is passed on CPUMASK_OFFSTACK=y kernels(v1)
When the irqaffinity= kernel parameter is passed in a CPUMASK_OFFSTACK=y
kernel, it fails to boot, because zalloc_cpumask_var() cannot be used before
initializing the slab allocator to allocate a cpumask.
So, use alloc_bootmem_cpumask_var() instead.
Also do some cleanups while at it: in init_irq_default_affinity() remove
an #ifdef via using cpumask_available().
Signed-off-by: Rakib Mullick <rakib.mullick@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20171026045800.27087-1-rakib.mullick@gmail.com
Link: http://lkml.kernel.org/r/20171101041451.12581-1-rakib.mullick@gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r-- | kernel/irq/irqdesc.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/irq/irqdesc.c b/kernel/irq/irqdesc.c index 982a3576fb01..f2edcf85780d 100644 --- a/kernel/irq/irqdesc.c +++ b/kernel/irq/irqdesc.c | |||
@@ -27,7 +27,7 @@ static struct lock_class_key irq_desc_lock_class; | |||
27 | #if defined(CONFIG_SMP) | 27 | #if defined(CONFIG_SMP) |
28 | static int __init irq_affinity_setup(char *str) | 28 | static int __init irq_affinity_setup(char *str) |
29 | { | 29 | { |
30 | zalloc_cpumask_var(&irq_default_affinity, GFP_NOWAIT); | 30 | alloc_bootmem_cpumask_var(&irq_default_affinity); |
31 | cpulist_parse(str, irq_default_affinity); | 31 | cpulist_parse(str, irq_default_affinity); |
32 | /* | 32 | /* |
33 | * Set at least the boot cpu. We don't want to end up with | 33 | * Set at least the boot cpu. We don't want to end up with |
@@ -40,10 +40,8 @@ __setup("irqaffinity=", irq_affinity_setup); | |||
40 | 40 | ||
41 | static void __init init_irq_default_affinity(void) | 41 | static void __init init_irq_default_affinity(void) |
42 | { | 42 | { |
43 | #ifdef CONFIG_CPUMASK_OFFSTACK | 43 | if (!cpumask_available(irq_default_affinity)) |
44 | if (!irq_default_affinity) | ||
45 | zalloc_cpumask_var(&irq_default_affinity, GFP_NOWAIT); | 44 | zalloc_cpumask_var(&irq_default_affinity, GFP_NOWAIT); |
46 | #endif | ||
47 | if (cpumask_empty(irq_default_affinity)) | 45 | if (cpumask_empty(irq_default_affinity)) |
48 | cpumask_setall(irq_default_affinity); | 46 | cpumask_setall(irq_default_affinity); |
49 | } | 47 | } |