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: 11903657 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 BE277C4742C for ; Fri, 13 Nov 2020 14:26:04 +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 611D022240 for ; Fri, 13 Nov 2020 14:26:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="3KQGUeU4"; dkim=fail reason="signature verification failed" (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" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 611D022240 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=BjCIx4AMYCRi+2qGFjMn4P2pXr4q81m8XiByZUDSH/U=; b=3KQGUeU4OdfKjmLLJNiRw0ie5 tuQAvSX56uke5hPntQYWIHqXRfYWCXMyvf1kLvZXBFqtlMxi2yPJzwi05mJyy/9t+FSxg1FOqgbgr wHDULgLATZCOuuuOu8lAlriY/XN91KEbaTxKukAji6cAcxe/m9pOV3QNuoyFr+g1GBST4yOBUJl5Q S33Y/2JUHl3rkDbyV7PHnRFDoKMsEUGE8iWa5/S9N+ymS4I4mlXdFKi+3jOllqiBCs2mXgBGM3OgR fIsGdop8eVgdWvA44pmtyq0WQj4EBLmkp58y8isbNLlDHdE04/7geBq4Ua1GjCHnry5DszdfS8+hS Z2TTSjJSQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kda15-0006gB-M0; Fri, 13 Nov 2020 14:25:31 +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 1kdZzz-0006Gs-4f; Fri, 13 Nov 2020 14:24:27 +0000 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 Subject: [patch 06/19] arm64: 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_092423_465047_5F7AEEFE X-CRM114-Status: GOOD ( 11.73 ) 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 , Paul McKenney , Arnd Bergmann , linux-sh@vger.kernel.org, Peter Zijlstra , Catalin Marinas , Frederic Weisbecker , Valentin Schneider , Jeff Dike , Russell King , Yoshinori Sato , "James E.J. Bottomley" , Richard Weinberger , linux-parisc@vger.kernel.org, Helge Deller , Marc Zyngier , 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: 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