From patchwork Fri Nov 13 14:02:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 11903639 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1C915921 for ; Fri, 13 Nov 2020 14:25:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F420622242 for ; Fri, 13 Nov 2020 14:25:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="lEDXukR0"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="8EcLL2Mj" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727065AbgKMOZV (ORCPT ); Fri, 13 Nov 2020 09:25:21 -0500 Received: from Galois.linutronix.de ([193.142.43.55]:52496 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726787AbgKMOYY (ORCPT ); Fri, 13 Nov 2020 09:24:24 -0500 Message-Id: <20201113141733.392015387@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1605277461; 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=TyQaO1KTOnQylNyXqxWcHMMYAxiiSJ2Q6FuIeS+IiF4=; b=lEDXukR0oK89SaoPklU/SlvTO4AL3FW7GtfHdqKagFFJBz68+N8DGdCe/0EEWypICcBgfZ wSwEA6mdjl0V8HHeF09kj/7r5ookPrS4PPP/mFt7wBY+msVoxO8OIaRotonDWQPXXat5ot UwXzLRGrG+BjHy9sq1LL5SuGdK2ZwyH6oYS17dxfNKVv40lxmUF0I/zMgsJTI2beJJ6Thk 3bgYhE2ykrFnPGkhew+FXzp5SoptOYITranaNsMPwVkAXjBXG1OVfC4kPgOyOQR0j4GYYz 83OwnIjUaKOVlixefPLnQ38+4y8XAZhRP+5bBagZC3NLAENT7q6vhSsVBtwIwA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1605277461; 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=TyQaO1KTOnQylNyXqxWcHMMYAxiiSJ2Q6FuIeS+IiF4=; b=8EcLL2MjKtWP9jXkLNSdACpvbZt324DYTS3ZV5jkNvp419QrSxtZ6sgw1e9rErz090S0+8 MNDYn4yqeq+V2VCA== Date: Fri, 13 Nov 2020 15:02:13 +0100 From: Thomas Gleixner To: LKML Cc: Peter Zijlstra , Frederic Weisbecker , Paul McKenney , Sebastian Andrzej Siewior , Arnd Bergmann , Catalin Marinas , Will Deacon , Marc Zyngier , linux-arm-kernel@lists.infradead.org, "James E.J. Bottomley" , Helge Deller , linux-parisc@vger.kernel.org, Yoshinori Sato , Rich Felker , linux-sh@vger.kernel.org, Jeff Dike , Richard Weinberger , Anton Ivanov , linux-um@lists.infradead.org, Russell King , Valentin Schneider Subject: [patch 06/19] arm64: irqstat: Get rid of duplicated declaration References: <20201113140207.499353218@linutronix.de> MIME-Version: 1.0 Content-transfer-encoding: 8-bit Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.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: Catalin Marinas Cc: Will Deacon Cc: Marc Zyngier Cc: linux-arm-kernel@lists.infradead.org Acked-by: Will Deacon Acked-by: Marc Zyngier --- arch/arm64/include/asm/hardirq.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) --- 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