Received: by 2002:ac0:946b:0:0:0:0:0 with SMTP id j40csp719185imj; Wed, 13 Feb 2019 16:27:38 -0800 (PST) X-Google-Smtp-Source: AHgI3IZqxH7+GBp7OI9qwb7QtDFrS911HrIAbgSgoO3rXbBQmQNPN7VIi4NiZH807ift8LYJMVGy X-Received: by 2002:a62:444b:: with SMTP id r72mr1010036pfa.184.1550104058788; Wed, 13 Feb 2019 16:27:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550104058; cv=none; d=google.com; s=arc-20160816; b=ZQKDFtxYbd625PJpH81HH2v5yeaFFGCcusTEo6LsNmAZC45LdwdZGgSbi54DCkA7k9 luEV1Hx3fwEorfKN4qLgViXZFsYTpjVWHgk25DFPqUQ6ntU2iQJ8S+ZUPbFfKvM6pBMF eH4JWjcIRpDmraBBcGdIHpbJ+Wx8ja1BioIQR9VAaySZREgOt+Z3XslxPryQ5LxF8xUJ iUMaArAGn80RZl0Syv4Mn8TfgSW38luecuE4o3RmVLtQU8Oev9/KQ3v1UtnzvS87nkcn fu+BU8/PgPXUOSJykt5lGkrbiFLjwRNeBQkoWYMWiU3J3OB2+tU3f7bviI47VVV+2nMI /uhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ipJKFABLRa9x8S0M3/AJQmWxuX14puhGJNHt7/j75kg=; b=CatAGIiliC2u/29tZv/76egjmHkCFzqS+Y+ytlJYSSYX//TooWWNgMYRlW3VkApKzI 1CvxGgBc2a6ZqGHEtw6kE0EaZG3FogvBQDYrdyGBbe2YUBTpZWlu/BgzIv1GL8dE8bcD QATe2jz7WuhZYgqdfkxQ73fzVFyO2eR/9B9EpuzxAXqBR3zUVr1SRfPFdoMHYbAZGegS HlK1ezR2yWalU+H9wYoDrqC/bpm27HFc02RH4kL+4sNsy1jGPaCGu3X40ZeX++XghmU2 OdGv60bAuFXAp2aVQGeNMjcd22RQlpdh/1m7ioH4y8nM5vLyzzGBGt/zZQzRull+lUAH gF4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=gjYNkADX; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g6si777175pgc.55.2019.02.13.16.27.22; Wed, 13 Feb 2019 16:27:38 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=gjYNkADX; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2394162AbfBMSwZ (ORCPT + 99 others); Wed, 13 Feb 2019 13:52:25 -0500 Received: from mail.kernel.org ([198.145.29.99]:41898 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2393967AbfBMSnT (ORCPT ); Wed, 13 Feb 2019 13:43:19 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5DE03222DA; Wed, 13 Feb 2019 18:43:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550083398; bh=4YtsB1BfHxwSLL88ZwvLNg52hn5jQAHGiMHP71X4OR0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gjYNkADXVMSM2KNNx0kGH60TuriMUYORlY2zn/Y10ctR9JbeF74easAgDLqRYwmvs 2wacIYYlKvWqpeiq5WERzpLMOxqGE7xka11+nsZOwSr/5HGBs8ke8V3cMpKNTysbYV D0n9VsAQWSKgUbdL5Jruy05tmsPaRwI9AGj+oLLs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Russell King , Arnd Bergmann Subject: [PATCH 4.19 24/44] ARM: iop32x/n2100: fix PCI IRQ mapping Date: Wed, 13 Feb 2019 19:38:25 +0100 Message-Id: <20190213183653.796277768@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190213183651.648060257@linuxfoundation.org> References: <20190213183651.648060257@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Russell King commit db4090920ba2d61a5827a23e441447926a02ffee upstream. Booting 4.20 on a TheCUS N2100 results in a kernel oops while probing PCI, due to n2100_pci_map_irq() having been discarded during boot. Signed-off-by: Russell King Cc: stable@vger.kernel.org # 2.6.18+ Signed-off-by: Arnd Bergmann Signed-off-by: Greg Kroah-Hartman --- arch/arm/mach-iop32x/n2100.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/arch/arm/mach-iop32x/n2100.c +++ b/arch/arm/mach-iop32x/n2100.c @@ -75,8 +75,7 @@ void __init n2100_map_io(void) /* * N2100 PCI. */ -static int __init -n2100_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) +static int n2100_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) { int irq;