Received: by 10.213.65.68 with SMTP id h4csp546862imn; Wed, 4 Apr 2018 03:09:10 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/z8uUocvkWxYZvts7xq+DKZ8qigBKLDrk2am84dBfjBzIAZx4vJSC53UvchKImVOKeAA6O X-Received: by 2002:a17:902:780d:: with SMTP id p13-v6mr17949520pll.281.1522836549987; Wed, 04 Apr 2018 03:09:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522836549; cv=none; d=google.com; s=arc-20160816; b=c0awFZgLJ2/uk8yZbjOzCQlzO9WtPYAZQZyqRU1Xp1PwgOWDTlnBHL5pcgP7I6ZJfX kveXtj7iifVeGuKYMoDwuOvE/vgc1xe8OKOHWUodPK+hpBwSfZttUoGx822XfdFoBRFP WajIVrXjVMplyOrc3eZxNUr3m/Xg29HgdThGPPEiZSW8RVyKwCAb8p9Tr0B16miBTtnR Obeu1SmmbciToOycZHYEh2ztTVS+PlDecptBHM+qLunxpCRegsRrJLayRd9xztUhTQW/ JWlU2RfaxCDBwJbnIzIfHQLVo9XAaNsP0ECeF4Wf6zx5jfus73Xxr1HQ1d4UfNu6sqTe BNTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-disposition :content-transfer-encoding:mime-version:robot-unsubscribe:robot-id :git-commit-id:subject:to:references:in-reply-to:reply-to:cc :message-id:from:date:arc-authentication-results; bh=vDi/JctFUiiHZaL6+abAjeOEk1wZ6tzpXSzC9czz+1o=; b=HBjv6hMVTlg1Iyo7kkif7DParfRNIdFgYdjTFXU5R/WpzxhkkjndXpM6MUgmdoxugf CdzKyDVZ/4X3e5zSYgkZC75P59wm7eaRmHF32oSNe2q4T1uEzuPQCiouH1e9XaEtvTAU CA/MMm5LcHWgafZY2rl4jv8UOA78wqJbt5QtFAPrntIDmdRAwjPBrdSl0w7DaaTrOWlx 7oz1IWE6KDnjWjyYk+gj8aRhROkc8fcfAav+jtsXVK/gZYFFSOOuYn/CfJqTcxCtaVw/ 10MVWXU2JZmDLKQ06vqJPRUuOVxfmBYyYu5dCnNfkK8Its6ZrP3J5H47/mLnUr4h+HbQ tZow== ARC-Authentication-Results: i=1; mx.google.com; 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 f4-v6si2661874plr.587.2018.04.04.03.08.55; Wed, 04 Apr 2018 03:09:09 -0700 (PDT) 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; 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 S1751362AbeDDKHl (ORCPT + 99 others); Wed, 4 Apr 2018 06:07:41 -0400 Received: from terminus.zytor.com ([198.137.202.136]:36419 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751301AbeDDKHi (ORCPT ); Wed, 4 Apr 2018 06:07:38 -0400 Received: from terminus.zytor.com (localhost [127.0.0.1]) by terminus.zytor.com (8.15.2/8.15.2) with ESMTP id w34A7P1d3904440; Wed, 4 Apr 2018 03:07:25 -0700 Received: (from tipbot@localhost) by terminus.zytor.com (8.15.2/8.15.2/Submit) id w34A7OI33904437; Wed, 4 Apr 2018 03:07:24 -0700 Date: Wed, 4 Apr 2018 03:07:24 -0700 X-Authentication-Warning: terminus.zytor.com: tipbot set sender to tipbot@zytor.com using -f From: tip-bot for Palmer Dabbelt Message-ID: Cc: tglx@linutronix.de, palmer@sifive.com, hpa@zytor.com, arnd@arndb.de, mingo@kernel.org, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org Reply-To: torvalds@linux-foundation.org, mingo@kernel.org, arnd@arndb.de, linux-kernel@vger.kernel.org, tglx@linutronix.de, palmer@sifive.com, hpa@zytor.com In-Reply-To: <20180404043130.31277-4-palmer@sifive.com> References: <20180404043130.31277-4-palmer@sifive.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] genirq: Make GENERIC_IRQ_MULTI_HANDLER depend on !MULTI_IRQ_HANDLER Git-Commit-ID: d6f73825dcd0fa1de9a6bf37c79f6109cc87b82f X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham autolearn_force=no version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on terminus.zytor.com Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: d6f73825dcd0fa1de9a6bf37c79f6109cc87b82f Gitweb: https://git.kernel.org/tip/d6f73825dcd0fa1de9a6bf37c79f6109cc87b82f Author: Palmer Dabbelt AuthorDate: Tue, 3 Apr 2018 21:31:30 -0700 Committer: Thomas Gleixner CommitDate: Wed, 4 Apr 2018 12:04:28 +0200 genirq: Make GENERIC_IRQ_MULTI_HANDLER depend on !MULTI_IRQ_HANDLER These config switches enable the same code in the core and the not yet converted architecture code. They can be selected both by randconfig builds and cause linker error because the same symbols are defined twice. Make the new GENERIC_IRQ_MULTI_HANDLER depend on !MULTI_IRQ_HANDLER to prevent that. The dependency will be removed once all architectures are converted over. Signed-off-by: Palmer Dabbelt Signed-off-by: Thomas Gleixner Cc: Linus Torvalds Cc: Arnd Bergmann Link: https://lkml.kernel.org/r/20180404043130.31277-4-palmer@sifive.com --- kernel/irq/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/irq/Kconfig b/kernel/irq/Kconfig index 5f3e2baefca9..c6766f326072 100644 --- a/kernel/irq/Kconfig +++ b/kernel/irq/Kconfig @@ -134,6 +134,7 @@ config GENERIC_IRQ_DEBUGFS endmenu config GENERIC_IRQ_MULTI_HANDLER + depends on !MULTI_IRQ_HANDLER bool help Allow to specify the low level IRQ handler at run time.