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 8847EC64E7C for ; Mon, 23 Nov 2020 22:53:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 37FB220717 for ; Mon, 23 Nov 2020 22:53:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="fPdMOwD/"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="Ds91ym0f" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387786AbgKWWwp (ORCPT ); Mon, 23 Nov 2020 17:52:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39344 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387540AbgKWWvu (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 5AD6CC0613CF; Mon, 23 Nov 2020 14:51:50 -0800 (PST) Date: Mon, 23 Nov 2020 22:51:47 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1606171908; 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=jHaQ7+aWpYd1G52BS6Q30yEkqRRE2IvI6iKwqutbdBM=; b=fPdMOwD/ojXzpkcsWfjnJgY030V0mWJlW004Knw52LFAa0cIXRnuFb/dqbVPPnTgg6sOHd /QRLQZh2MrU6xxAxYGEQkkH8JbhVQA4hhfcYsBrj5C+oNchKyrF3ktaLeYTDHfyf99pKo0 loy15RurwEdK7uzs6TiFics/Wn6YdaD1Jk3sF8aUSzwvJ+bBDSMu8E9m4AFpN+qNh8EtqF WndeB52qcVPCzm9c7i18WuumM4nTGQ2XKq+o5kYoPrqgL7OqZXg+89z3LCTl84iPvbjAp+ 5Ejdt/Z7dmk/wUhfDGz1Eaj9hlDiIavCTLH+m8ptBvKBYyGBCI5ilBPYE1eugw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1606171908; 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=jHaQ7+aWpYd1G52BS6Q30yEkqRRE2IvI6iKwqutbdBM=; b=Ds91ym0fjDOTY5wlHtJ7IM4mw5nA3HyjEmHhGGph9utS2rCUFl89EsU+ZyjD+0t5z9WKD0 E1IjzjFAR/910xBw== 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] um/irqstat: Get rid of the duplicated declarations Cc: Thomas Gleixner , Frederic Weisbecker , x86@kernel.org, linux-kernel@vger.kernel.org, maz@kernel.org In-Reply-To: <20201113141733.156361337@linutronix.de> References: <20201113141733.156361337@linutronix.de> MIME-Version: 1.0 Message-ID: <160617190799.11115.15507871466882450295.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: e83694a7b249de63beb1d8b45474b796dce3cd45 Gitweb: https://git.kernel.org/tip/e83694a7b249de63beb1d8b45474b796dce3cd45 Author: Thomas Gleixner AuthorDate: Fri, 13 Nov 2020 15:02:11 +01:00 Committer: Thomas Gleixner CommitterDate: Mon, 23 Nov 2020 10:31:05 +01:00 um/irqstat: Get rid of the duplicated declarations irq_cpustat_t and ack_bad_irq() are exactly the same as the asm-generic ones. Signed-off-by: Thomas Gleixner Reviewed-by: Frederic Weisbecker Link: https://lore.kernel.org/r/20201113141733.156361337@linutronix.de --- arch/um/include/asm/hardirq.h | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/arch/um/include/asm/hardirq.h b/arch/um/include/asm/hardirq.h index b426796..52e2c36 100644 --- a/arch/um/include/asm/hardirq.h +++ b/arch/um/include/asm/hardirq.h @@ -2,22 +2,7 @@ #ifndef __ASM_UM_HARDIRQ_H #define __ASM_UM_HARDIRQ_H -#include -#include - -typedef struct { - unsigned int __softirq_pending; -} ____cacheline_aligned irq_cpustat_t; - -#include /* Standard mappings for irq_cpustat_t above */ -#include - -#ifndef ack_bad_irq -static inline void ack_bad_irq(unsigned int irq) -{ - printk(KERN_CRIT "unexpected IRQ trap at vector %02x\n", irq); -} -#endif +#include #define __ARCH_IRQ_EXIT_IRQS_DISABLED 1