From patchwork Fri Nov 13 14:02:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 11903655 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 B5008C4742C for ; Fri, 13 Nov 2020 14:25:43 +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 6C67B22226 for ; Fri, 13 Nov 2020 14:25:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="0UoaMtOt"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="O0Gw/PBR"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="xm6caWsh" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6C67B22226 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=Hfyh4efAB7P8A307IlXUZ+ovOKQWsoLM4iOzaoc6bNQ=; b=0UoaMtOtzFUpnYmKAoGgy087z 1LF9H36YEt1+Sv1v/Y2XlZdA4RP6Pae/YWQ8qwMd+asC50JteBpYRtGxVN39y+iwD06Nv+5ojbu6a nPw5/yxbWty18MqsPv5zCij3drSNd17mMgBeQ84JEVvkpEJlwN/TPjTotk0QnWBWlYqIopzzeo1YN qQDJYV9cSqCFF/tvoO1R4T/jHTHWwbKG2DLgXhIUH+gz9C2Iz4y95k/6oD/84M7OzBSbcmcvg7xkR 08D2Qww33fXyDxm4FywFOV9r+SUDOH9qMIgSRKv5nCHD0zaEZDcmTkwRxSMJyqBvqrYlHwweG9Ry3 FFt3zmRcQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kda0n-0006a6-6g; Fri, 13 Nov 2020 14:25:13 +0000 Received: from galois.linutronix.de ([193.142.43.55]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kdZzw-0006FW-Hm; Fri, 13 Nov 2020 14:24:24 +0000 Message-Id: <20201113141733.156361337@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1605277459; 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=r+KsoatkzEvFJZ6Uvemw+0bRBnybVbuAAET/CM5K9Pk=; b=O0Gw/PBRfyV5eSjQcVbv7jg+mEj3vPu+omjz2/4gumbSqYTwbod9fjfxDBec4KD3ldbfj1 PKTwzSBW+XPJ5yA4AToMdseNerHoIbd6/J6Ak2g0AJSySvu1E1qwcXempGYdbHR3E9L8m6 HUkEVjg30iV6HuEAWXHO5t5JWELG7hR7rYG86QhVorHRWkTx3bfNZ1QZCbNLkbHGThTj9h Gmy1CtUgQRty4mQJxzs5u4m4E890g/7qSRuvoEBxpoozS8r8bgiVGBYkFzTvoHfi2Ge2xV wl4VyGJTXnKlI48Yyl9nD27SGp7lD50AAUO7KCpatdJr9vU0agxVjcJ6SLopZA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1605277459; 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=r+KsoatkzEvFJZ6Uvemw+0bRBnybVbuAAET/CM5K9Pk=; b=xm6caWshtGnMX9Pmj2feIgupPTX3uOPlK73ZAKK12FC5HYr0Iu+WtgRZY/vqPeNKeXFDjU JzBZ9C0kLyStR8Bw== Date: Fri, 13 Nov 2020 15:02:11 +0100 From: Thomas Gleixner To: LKML Subject: [patch 04/19] um/irqstat: Get rid of the duplicated declarations 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_092420_780704_290D7FA7 X-CRM114-Status: GOOD ( 10.21 ) 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: "James E.J. Bottomley" , Rich Felker , Marc Zyngier , Paul McKenney , Arnd Bergmann , linux-sh@vger.kernel.org, Peter Zijlstra , Richard Weinberger , Frederic Weisbecker , Valentin Schneider , Jeff Dike , Russell King , Yoshinori Sato , linux-um@lists.infradead.org, Will Deacon , linux-parisc@vger.kernel.org, Helge Deller , Catalin Marinas , 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 and ack_bad_irq() are exactly the same as the asm-generic ones. Signed-off-by: Thomas Gleixner Cc: Jeff Dike Cc: Richard Weinberger Cc: Anton Ivanov Cc: linux-um@lists.infradead.org --- arch/um/include/asm/hardirq.h | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) --- 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