From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 60C46C4332F for ; Tue, 28 Sep 2021 06:00:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 49A996108F for ; Tue, 28 Sep 2021 06:00:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239107AbhI1GBp (ORCPT ); Tue, 28 Sep 2021 02:01:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:49680 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239446AbhI1F7f (ORCPT ); Tue, 28 Sep 2021 01:59:35 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1C68B6137B; Tue, 28 Sep 2021 05:57:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1632808629; bh=tXM17ftZo6zb9iZvoXX/Qu2JrcVS4VAYlpj1pqVIu9g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sfIAaV5gm//1A4yqwY1AVFwidodIhkhjnoXIkh1n5eQo57QLGwH1BVI2nh1WT7n8z gyVZPWiKFyx5qy4hQj5MZzkNDNe3cjZ4IZowIbZW5rjB7IhI8BSbSaYKqFXtHelo9N oMqopLp/qegnhmTq0zeqzNiV0WvyNyEe7JIZajtZldUdi74twMXdpbkjSNh2qQ2TyA TfzlmYI0FxHUIXQoA3+E2Au0jF7iv+Cdk9Ptdm0R3bYV1257CVoKybcIUesZUJ8Ihr NDiWPUvR4qqhJSUJ54oASC7OfHbJixfipRf3oyoqn/rP0hZ4bhorsD8m3II+9UVU2Z 3px83+lIDqoQw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Linus Torvalds , Guenter Roeck , David Miller , Sasha Levin , sparclinux@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 03/11] sparc64: fix pci_iounmap() when CONFIG_PCI is not set Date: Tue, 28 Sep 2021 01:56:56 -0400 Message-Id: <20210928055704.172814-3-sashal@kernel.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210928055704.172814-1-sashal@kernel.org> References: <20210928055704.172814-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Linus Torvalds [ Upstream commit d8b1e10a2b8efaf71d151aa756052fbf2f3b6d57 ] Guenter reported [1] that the pci_iounmap() changes remain problematic, with sparc64 allnoconfig and tinyconfig still not building due to the header file changes and confusion with the arch-specific pci_iounmap() implementation. I'm pretty convinced that sparc should just use GENERIC_IOMAP instead of doing its own thing, since it turns out that the sparc64 version of pci_iounmap() is somewhat buggy (see [2]). But in the meantime, this just fixes the build by avoiding the trivial re-definition of the empty case. Link: https://lore.kernel.org/lkml/20210920134424.GA346531@roeck-us.net/ [1] Link: https://lore.kernel.org/lkml/CAHk-=wgheheFx9myQyy5osh79BAazvmvYURAtub2gQtMvLrhqQ@mail.gmail.com/ [2] Reported-by: Guenter Roeck Cc: David Miller Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- arch/sparc/lib/iomap.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/sparc/lib/iomap.c b/arch/sparc/lib/iomap.c index c9da9f139694..f3a8cd491ce0 100644 --- a/arch/sparc/lib/iomap.c +++ b/arch/sparc/lib/iomap.c @@ -19,8 +19,10 @@ void ioport_unmap(void __iomem *addr) EXPORT_SYMBOL(ioport_map); EXPORT_SYMBOL(ioport_unmap); +#ifdef CONFIG_PCI void pci_iounmap(struct pci_dev *dev, void __iomem * addr) { /* nothing to do */ } EXPORT_SYMBOL(pci_iounmap); +#endif -- 2.33.0