From patchwork Fri Nov 13 14:02:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 11903665 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2356DC388F7 for ; Fri, 13 Nov 2020 14:27:06 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A93302222F for ; Fri, 13 Nov 2020 14:27:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="SUcvpaaN"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="cSGo9Tj3"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="noONE0IN" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A93302222F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linutronix.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:Subject:To:From:Date: Message-Id:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:List-Owner; bh=2Eo7A8nKK6xDnwoo4bVGkoj2j8r3RHQSQIqTHUBoXyQ=; b=SUcvpaaNlLvB5liqBggBfrEzS 6FOSBGb3mAF02LoHnmnCsbppF2Nsh2JDD+VvB6WC/FvpQdh9HcTJCvHExCTm0IjPSXzbllOKe6ls/ mo87Uk//Nkyj2SnHf0uvjhofmEXX4PrAimWeQf767TpzG3a5IGg6ECqywRNFlJa5+0BgZb167sVF0 a0qcXP+l3sROFpvopIa6NC4mH/imtqRwRSwgr45TtrwJmPrCghsJI0ENYU1p1hCYwZ3a6KFwYHjq9 bK1gl3r1neNZf+jXgGx6/k1DAAl/x2HsPKkDH8jOsEiB0SYK6JZz0DHW1b/Apdk6zDUXVn6IRmBeW C+eGGqD7Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kda0w-0006cy-En; Fri, 13 Nov 2020 14:25:22 +0000 Received: from galois.linutronix.de ([2a0a:51c0:0:12e:550::1]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kdZzx-0006G3-TN; Fri, 13 Nov 2020 14:24:25 +0000 Message-Id: <20201113141733.276505871@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1605277460; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: references:references; bh=LTgrOO5Fq9FzIj5LSBGHqN8dEDpi/W15DA3S3hhXg70=; b=cSGo9Tj3VjO3e4v7/dAH4IZZ25PwX3n0as7D8hV6VwZCQNPp1S/12d3Kuq14YP2Q+vyrH8 jJ/wX30Nie2wEr/7EzpBjuF3iQ1GzsFOZEuMiW2uttAjvlghPcqlVwST2tjAzHciJ3rLq2 7uMKgBEOH2VHJqnsUsfRZ0RZTXOPOxBG+ztScXR/kk53gqcz+APJbPKljJlmOTBDu0qFSd geRk0h1rhyNhLZUWadkKhKDlm2LK9xR6e6jqW+rtDsZmAZ0P4di9X83bBTcSkBrFBjeZOz jTvXn+8jksC0VgwFXsC/4El8Vh0d+LxM/viS14PxPZXkBWuZlPiBQb7W9OznGg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1605277460; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: references:references; bh=LTgrOO5Fq9FzIj5LSBGHqN8dEDpi/W15DA3S3hhXg70=; b=noONE0INwvcUkNhZIQyhLfhz07DlUVIlJ0h9nTo2GLLZIKCJd/IkkvvJH09DJ6hENwmy+q rE/SZK+1OHpuQlDw== Date: Fri, 13 Nov 2020 15:02:12 +0100 From: Thomas Gleixner To: LKML Subject: [patch 05/19] ARM: irqstat: Get rid of duplicated declaration References: <20201113140207.499353218@linutronix.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201113_092422_231305_A51A0F49 X-CRM114-Status: GOOD ( 13.06 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rich Felker , Catalin Marinas , Paul McKenney , Arnd Bergmann , Yoshinori Sato , Peter Zijlstra , Marc Zyngier , Frederic Weisbecker , linux-sh@vger.kernel.org, Jeff Dike , Russell King , Valentin Schneider , "James E.J. Bottomley" , Richard Weinberger , linux-parisc@vger.kernel.org, Helge Deller , linux-um@lists.infradead.org, Will Deacon , Sebastian Andrzej Siewior , linux-arm-kernel@lists.infradead.org, Anton Ivanov Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org irq_cpustat_t is exactly the same as the asm-generic one. Define ack_bad_irq so the generic header does not emit the generic version of it. Signed-off-by: Thomas Gleixner Cc: Russell King Cc: Marc Zyngier Cc: Valentin Schneider Cc: linux-arm-kernel@lists.infradead.org Reviewed-by: Valentin Schneider --- arch/arm/include/asm/hardirq.h | 11 +++-------- arch/arm/include/asm/irq.h | 2 ++ 2 files changed, 5 insertions(+), 8 deletions(-) --- a/arch/arm/include/asm/hardirq.h +++ b/arch/arm/include/asm/hardirq.h @@ -2,16 +2,11 @@ #ifndef __ASM_HARDIRQ_H #define __ASM_HARDIRQ_H -#include -#include #include -typedef struct { - unsigned int __softirq_pending; -} ____cacheline_aligned irq_cpustat_t; - -#include /* Standard mappings for irq_cpustat_t above */ - #define __ARCH_IRQ_EXIT_IRQS_DISABLED 1 +#define ack_bad_irq ack_bad_irq + +#include #endif /* __ASM_HARDIRQ_H */ --- a/arch/arm/include/asm/irq.h +++ b/arch/arm/include/asm/irq.h @@ -31,6 +31,8 @@ void handle_IRQ(unsigned int, struct pt_ void init_IRQ(void); #ifdef CONFIG_SMP +#include + extern void arch_trigger_cpumask_backtrace(const cpumask_t *mask, bool exclude_self); #define arch_trigger_cpumask_backtrace arch_trigger_cpumask_backtrace