From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932278AbdJZE6R (ORCPT ); Thu, 26 Oct 2017 00:58:17 -0400 Received: from mail-pg0-f65.google.com ([74.125.83.65]:53347 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750997AbdJZE6O (ORCPT ); Thu, 26 Oct 2017 00:58:14 -0400 X-Google-Smtp-Source: ABhQp+Sads7DD7b97VncRUBFOkHkLvY2XJExwFhKDFZzjKioSdZg9qnpa6vV+eSgp3buTskwnQKcPw== From: Rakib Mullick To: mingo@kernel.org, tglx@linutronix.de Cc: linux-kernel@vger.kernel.org Subject: [PATCH] [irq] Fix boot failure when irqaffinity is passed. Date: Thu, 26 Oct 2017 10:58:00 +0600 Message-Id: <20171026045800.27087-1-rakib.mullick@gmail.com> X-Mailer: git-send-email 2.9.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When irqaffinity kernel param is passed in a CPUMASK_OFFSTACK=y build kernel, it fails to boot. zalloc_cpumask_var() cannot be used before initializing mm stuff (slab allocator) to allocate cpumask. So, use alloc_bootmem_cpumask_var(). Also in init_irq_default_affinity() removes unneeded ifdef, these ifdef conditions are handled at defination site. Signed-off-by: Rakib Mullick --- kernel/irq/irqdesc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/kernel/irq/irqdesc.c b/kernel/irq/irqdesc.c index 982a357..db6380d 100644 --- a/kernel/irq/irqdesc.c +++ b/kernel/irq/irqdesc.c @@ -27,7 +27,7 @@ static struct lock_class_key irq_desc_lock_class; #if defined(CONFIG_SMP) static int __init irq_affinity_setup(char *str) { - zalloc_cpumask_var(&irq_default_affinity, GFP_NOWAIT); + alloc_bootmem_cpumask_var(&irq_default_affinity); cpulist_parse(str, irq_default_affinity); /* * Set at least the boot cpu. We don't want to end up with @@ -40,10 +40,8 @@ __setup("irqaffinity=", irq_affinity_setup); static void __init init_irq_default_affinity(void) { -#ifdef CONFIG_CPUMASK_OFFSTACK if (!irq_default_affinity) zalloc_cpumask_var(&irq_default_affinity, GFP_NOWAIT); -#endif if (cpumask_empty(irq_default_affinity)) cpumask_setall(irq_default_affinity); } -- 2.9.3