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 17687C63697 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 B9587206D8 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="WVr5V18M"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="xkqXW7JB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387719AbgKWWwl (ORCPT ); Mon, 23 Nov 2020 17:52:41 -0500 Received: from Galois.linutronix.de ([193.142.43.55]:38932 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387534AbgKWWvt (ORCPT ); Mon, 23 Nov 2020 17:51:49 -0500 Date: Mon, 23 Nov 2020 22:51:45 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1606171906; 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=GkBw7P73uLvcEZkfhady/16eN+F041E6rZq3AYnI4sQ=; b=WVr5V18MaXMcMevkHxF6aY4jtYXDueuoMRUh1miEVWHf4bNcBe5ad298EolU+Ihgv+sRan l6BTjyWffYCdSoR2kKcyg9wFZg8co9fxC+bMNRvshC18m8Jc4sTq8zHN/ofM18ptoh+0xs +LNyW1aIFudwv0ejTybzqepMXeZTYQh/3QC7FRqmlJh+JzqJiukbwl/QsBKOo9afx5Alnu DMOMD3sZwVfecAvVYaklVjn5wk3D0uHNsTyJAB/gv5vx1pD6CW0i6KtNEa4pkFYOyy7JSF N5fogO5GntuE3G1hvsrRrY/gvaJx03OVXiBWMpz6ep54Vwo/DMtudRu7TC8uBQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1606171906; 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=GkBw7P73uLvcEZkfhady/16eN+F041E6rZq3AYnI4sQ=; b=xkqXW7JBJf5EXVyWXggbNpsPauMj6V2ftrFKxRgXFJCYhmmrPn7suZkdZ00JfuorgvJ1E2 +24LYokOZItR0mCg== 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] sh: irqstat: Use the generic irq_cpustat_t Cc: Thomas Gleixner , Frederic Weisbecker , x86@kernel.org, linux-kernel@vger.kernel.org, maz@kernel.org In-Reply-To: <20201113141733.625146223@linutronix.de> References: <20201113141733.625146223@linutronix.de> MIME-Version: 1.0 Message-ID: <160617190559.11115.1468849090363137294.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: fd15c1941f0ae0b46d48431d0020edfc843abd33 Gitweb: https://git.kernel.org/tip/fd15c1941f0ae0b46d48431d0020edfc843abd33 Author: Thomas Gleixner AuthorDate: Fri, 13 Nov 2020 15:02:15 +01:00 Committer: Thomas Gleixner CommitterDate: Mon, 23 Nov 2020 10:31:06 +01:00 sh: irqstat: Use the generic irq_cpustat_t 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 Reviewed-by: Frederic Weisbecker Link: https://lore.kernel.org/r/20201113141733.625146223@linutronix.de --- arch/sh/include/asm/hardirq.h | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/arch/sh/include/asm/hardirq.h b/arch/sh/include/asm/hardirq.h index edaea35..9fe4495 100644 --- 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 */