Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752331AbdHIV0G (ORCPT ); Wed, 9 Aug 2017 17:26:06 -0400 Received: from mail-oi0-f68.google.com ([209.85.218.68]:36981 "EHLO mail-oi0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751958AbdHIV0E (ORCPT ); Wed, 9 Aug 2017 17:26:04 -0400 From: minyard@acm.org To: linux-mips@linux-mips.org, ralf@linux-mips.org, linux-kernel@vger.kernel.org Cc: Corey Minyard Subject: [PATCH] mips: Fix using smp_processor_id() when preemptible Date: Wed, 9 Aug 2017 16:25:50 -0500 Message-Id: <1502313950-725-1-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1126 Lines: 42 From: Corey Minyard I was getting the following: BUG: using smp_processor_id() in preemptible [00000000] code: swapper/0/1 caller is pcibios_set_cache_line_size+0x10/0x58 pcibios_set_cache_line_size() used current_cpu_data outside of an unpreemptible context. Signed-off-by: Corey Minyard --- arch/mips/pci/pci.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c index bd67ac7..afd2f8a 100644 --- a/arch/mips/pci/pci.c +++ b/arch/mips/pci/pci.c @@ -28,9 +28,11 @@ EXPORT_SYMBOL(PCIBIOS_MIN_MEM); static int __init pcibios_set_cache_line_size(void) { - struct cpuinfo_mips *c = ¤t_cpu_data; + struct cpuinfo_mips *c; unsigned int lsize; + preempt_disable(); + c = ¤t_cpu_data; /* * Set PCI cacheline size to that of the highest level in the * cache hierarchy. @@ -38,6 +40,7 @@ static int __init pcibios_set_cache_line_size(void) lsize = c->dcache.linesz; lsize = c->scache.linesz ? : lsize; lsize = c->tcache.linesz ? : lsize; + preempt_enable(); BUG_ON(!lsize); -- 2.7.4