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 X-Spam-Level: X-Spam-Status: No, score=-20.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham 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 334D5C63798 for ; Mon, 23 Nov 2020 22:53:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F1F1A20717 for ; Mon, 23 Nov 2020 22:53:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="Yrd38s0g"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="oM/vqD9X" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387770AbgKWWwn (ORCPT ); Mon, 23 Nov 2020 17:52:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39346 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387541AbgKWWvu (ORCPT ); Mon, 23 Nov 2020 17:51:50 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 79629C061A4D; Mon, 23 Nov 2020 14:51:50 -0800 (PST) Date: Mon, 23 Nov 2020 22:51:46 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1606171907; h=from:from:sender:sender:reply-to: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: in-reply-to:in-reply-to:references:references; bh=z+gG496E2BgxvaVGCXJJEfT7jZ7ytarDwdinxOoXvgg=; b=Yrd38s0gOLohQHWIoA8bzAfbdSK6ZhchAQJKMKzemcNS/ijIepl3byqRTCJZQdQIe59B6I rS3V1xQtTi2Uyy1SaK//ggYgoPkRu6PbAcf3O0eH2MaqBQBfeCQwX4BtGxzkxAOlv8Z1CZ vkmqGJj78tgLkjWCs1ovcmmVp32fOPdJidUUGaPNjvJb2hPSma2IxVMglk0ZlFCVlo9bn/ q4GAX3tkLs9f29OH2nQXnxm85P8OJgwrzKXQ5D1izuIKaTkCegTuNVUFpcCxVPVLhBZv0v j0kYzXJbELDZnNvEsTTuKWTPL0g8o5NI3by8VWky93tUAjLv3NQVgb5QGneLfA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1606171907; h=from:from:sender:sender:reply-to: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: in-reply-to:in-reply-to:references:references; bh=z+gG496E2BgxvaVGCXJJEfT7jZ7ytarDwdinxOoXvgg=; b=oM/vqD9X4RzMrpHpuYnUxLo8RGdKmTr7xgD/WjhCrSc+tCfFjD2wMxLb34mjoziaydfWYi 7wSsHDSRHhZlsWCQ== From: "tip-bot2 for Thomas Gleixner" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: irq/core] arm64: irqstat: Get rid of duplicated declaration Cc: Thomas Gleixner , Frederic Weisbecker , Will Deacon , Marc Zyngier , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20201113141733.392015387@linutronix.de> References: <20201113141733.392015387@linutronix.de> MIME-Version: 1.0 Message-ID: <160617190678.11115.3868292191963465356.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the irq/core branch of tip: Commit-ID: 2cb0837e56e1b04b773ed05df72297de4e010063 Gitweb: https://git.kernel.org/tip/2cb0837e56e1b04b773ed05df72297de4e010063 Author: Thomas Gleixner AuthorDate: Fri, 13 Nov 2020 15:02:13 +01:00 Committer: Thomas Gleixner CommitterDate: Mon, 23 Nov 2020 10:31:05 +01:00 arm64: irqstat: Get rid of duplicated declaration 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 Reviewed-by: Frederic Weisbecker Acked-by: Will Deacon Acked-by: Marc Zyngier Link: https://lore.kernel.org/r/20201113141733.392015387@linutronix.de --- arch/arm64/include/asm/hardirq.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/arm64/include/asm/hardirq.h b/arch/arm64/include/asm/hardirq.h index 5ffa4ba..cbfa7b6 100644 --- a/arch/arm64/include/asm/hardirq.h +++ b/arch/arm64/include/asm/hardirq.h @@ -13,11 +13,8 @@ #include #include -typedef struct { - unsigned int __softirq_pending; -} ____cacheline_aligned irq_cpustat_t; - -#include /* Standard mappings for irq_cpustat_t above */ +#define ack_bad_irq ack_bad_irq +#include #define __ARCH_IRQ_EXIT_IRQS_DISABLED 1