From patchwork Fri Nov 13 14:02:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 11903653 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 93F74C4742C for ; Fri, 13 Nov 2020 14:26:16 +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 3F12322226 for ; Fri, 13 Nov 2020 14:26:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="T0JnC9hh"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="X0A7oXXL"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="IfoJhzBO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3F12322226 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=FJYiPE23Wf+GW0S0iUHTEHu62SLkMFNAb0rPjB8jbRM=; b=T0JnC9hhWL0AfKgK9Rgv0Z80/ pHCoOFk0Kzam9Fs362dEITwb+XWgPaqSmaza4uNxrYm6vVNorFCM3SZbbfp9SvmcUtnhFu2wgSC2i bsBANpCKNeJxgQcyG1VFu6+Ah0ymJw2B6uM+1dP3BghbAIIXdolKbGqo86Ej0zFkZErdohLO6MI7h +WeG9Zqt2VbMcxF4mOzTI1uQUb54tlMFL8vIUoO7iicCYCJqQd5+C+TpVXkCL87Qojd6DX0D9536e wiilrW+e8hz4YEOqLqerb4MWarxW3G0BeWnqXoc0ETDKue3yhnH76Rt2QW/Fg0qpgxvIm8cutkc87 /uFA2Q9DA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kda1K-0006lg-V4; Fri, 13 Nov 2020 14:25:47 +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 1kda02-0006IM-9j; Fri, 13 Nov 2020 14:24:29 +0000 Message-Id: <20201113141733.625146223@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1605277464; 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=j4YFkLEVJW9mHHVjXYizVQN08g6GeJTUUb5qDNcMGts=; b=X0A7oXXLl77tzShFHyL2be6dGuH2n0ajai/5PNHmXMm2Nduo9l3C78d2rRfs8um7hiajwz LLHAaVgSEsf6QYSzwSiDzq7rbw2QitpZ/aAANOMbAqrig6bybRybNZB2muYuDrXv5T0Hog aHx9kd4TQ2jtGQ+JxY6sbWUbsBVwCq+pV/QRiq3z6aaCJCLE9A1b9C5fsm24FrH0YwrudH abLQf3y2N1gR3t9uvLayu0DU2BCqPqAeUlywRucg5A6Eb8qDHpfmNIYKW7ulE/xc0pSBjS U0YyqBRBrS8x2r8DBsXej93yuZ/6flBjmjqANnRgpcLYv59gobr0sTeVHTdWZA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1605277464; 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=j4YFkLEVJW9mHHVjXYizVQN08g6GeJTUUb5qDNcMGts=; b=IfoJhzBOzwM0Ah30l/7drK6GoTjrrURxvcwYoU7580CtlGXgaQQtBYwJYv96kjOc5mH649 PlRaWsaQfp6lUCDg== Date: Fri, 13 Nov 2020 15:02:15 +0100 From: Thomas Gleixner To: LKML Subject: [patch 08/19] sh: irqstat: Use the generic irq_cpustat_t 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_092426_491609_23A46FF2 X-CRM114-Status: GOOD ( 10.56 ) 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: Marc Zyngier , Rich Felker , Catalin Marinas , Paul McKenney , Arnd Bergmann , linux-sh@vger.kernel.org, Peter Zijlstra , Richard Weinberger , Frederic Weisbecker , Valentin Schneider , Jeff Dike , Russell King , Yoshinori Sato , "James E.J. Bottomley" , 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 SH can now use the generic irq_cpustat_t. Define ack_bad_irq so the generic header does not emit the generic version of it. Signed-off-by: Thomas Gleixner Cc: Yoshinori Sato Cc: Rich Felker Cc: linux-sh@vger.kernel.org --- arch/sh/include/asm/hardirq.h | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) --- a/arch/sh/include/asm/hardirq.h +++ b/arch/sh/include/asm/hardirq.h @@ -2,16 +2,10 @@ #ifndef __ASM_SH_HARDIRQ_H #define __ASM_SH_HARDIRQ_H -#include -#include - -typedef struct { - unsigned int __softirq_pending; - unsigned int __nmi_count; /* arch dependent */ -} ____cacheline_aligned irq_cpustat_t; - -#include /* Standard mappings for irq_cpustat_t above */ - extern void ack_bad_irq(unsigned int irq); +#define ack_bad_irq ack_bad_irq +#define ARCH_WANTS_NMI_IRQSTAT + +#include #endif /* __ASM_SH_HARDIRQ_H */