From patchwork Sun Jul 12 22:02:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 6773311 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2843F9F2F0 for ; Sun, 12 Jul 2015 22:02:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EC9EC20632 for ; Sun, 12 Jul 2015 22:02:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A7B0920619 for ; Sun, 12 Jul 2015 22:02:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752157AbbGLWCS (ORCPT ); Sun, 12 Jul 2015 18:02:18 -0400 Received: from mail-ig0-f176.google.com ([209.85.213.176]:36070 "EHLO mail-ig0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752117AbbGLWCP (ORCPT ); Sun, 12 Jul 2015 18:02:15 -0400 Received: by igbij6 with SMTP id ij6so9446644igb.1 for ; Sun, 12 Jul 2015 15:02:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=nGZCTj9EbnBQz+zXbkLp/Y4p1KDwQj260/ISbNdUSfc=; b=YVwtyMiL1/HxzC8djkAd5pF+qTOFNszvbLDt5n848uh7ZC6yihuREfYCudgl10zl3j geJHWlOiYZUGIcqAtRmLjwFcLQFI82JXCuQRsEDBeLTJVy4ZwbmIF+l5fRNx2mnX8vgM UxLbNJfsimsTPNVn1eTwQLPPIOWOFOBDilE4tTE/ZE/+pxVH9+czJ51z5m0gehtUfbr/ OWMTcptWfQFnDI9d1QwP3wVN1h5Ed11rQd4HLs2PdsQIFrzH5SjvI8jD95jrpxLvFyK9 uVqURSo3jnLSddcC2xOHw5AYLJFI3IyFRy0XU+y/ZcCtR7iYWV9MmH2TEj8IEQPtphel IXvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:from:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-type :content-transfer-encoding; bh=nGZCTj9EbnBQz+zXbkLp/Y4p1KDwQj260/ISbNdUSfc=; b=fdLixIhP0tu34dGk4cJPbx+3W1ASYkPVfho7BiCAmE4r96jXdRxhiaU+KaHEcnoy9K BYCrl6gX9vj9NGQsOhTwR1kUwFD/PRb0NPVlWS/tTFfSFLVGtfire3WBeRoak283yNJ1 U7oqYypfwW9KKpw6ViGvaMdTYMeDGxEA3mTZGVAha9eP9VaTa8UvjTrRzWD5GIGNEyLT vWgJWR1VmVpz4/xWsFU3Mzx7ftKp82gkGbxVYxGlf1Ii9Dk8HFidjJhrHIF9EOjFQWT7 jt6TJrMI9ra/3YHTLS0VFXoaIOttm/PLz30ueBsNx89vgHXE9cuv7I/CPmbiqGhLFQcl e0wg== X-Gm-Message-State: ALoCoQlY4uQ2WXpZJUo+VR871sVpkpMRuysCieAaiOurNdP/iBpc/obR2qOj4e0b6yWtcBxZ2C2S X-Received: by 10.107.10.96 with SMTP id u93mr14318119ioi.172.1436738534297; Sun, 12 Jul 2015 15:02:14 -0700 (PDT) Received: from localhost ([69.71.1.1]) by smtp.gmail.com with ESMTPSA id l62sm11258117iol.36.2015.07.12.15.02.12 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 12 Jul 2015 15:02:13 -0700 (PDT) Subject: [PATCH 3/3] IRQ: Print "unexpected IRQ" messages consistently across architectures To: Thomas Gleixner From: Bjorn Helgaas Cc: linux-arch@vger.kernel.org, linux-mips@linux-mips.org, linux-am33-list@redhat.com, linux-ia64@vger.kernel.org, linux-c6x-dev@linux-c6x.org, linux-parisc@vger.kernel.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, adi-buildroot-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-alpha@vger.kernel.org, x86@kernel.org, linuxppc-dev@lists.ozlabs.org Date: Sun, 12 Jul 2015 17:02:11 -0500 Message-ID: <20150712220211.7166.42035.stgit@bhelgaas-glaptop2.roam.corp.google.com> In-Reply-To: <20150712215559.7166.33068.stgit@bhelgaas-glaptop2.roam.corp.google.com> References: <20150712215559.7166.33068.stgit@bhelgaas-glaptop2.roam.corp.google.com> User-Agent: StGit/0.16 MIME-Version: 1.0 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-5.7 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, SUSPICIOUS_RECIPS, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Many architectures use a variant of "unexpected IRQ trap at vector %x" to log unexpected IRQs. This is confusing because (a) it prints the Linux IRQ number, but "vector" more often refers to a CPU vector number, and (b) it prints the IRQ number in hex with no base indication, while Linux IRQ numbers are usually printed in decimal. Print the same text ("unexpected IRQ %d") across all architectures. No functional change other than the output text. Signed-off-by: Bjorn Helgaas Acked-by: Geert Uytterhoeven --- arch/alpha/kernel/irq.c | 2 +- arch/blackfin/kernel/irqchip.c | 2 +- arch/c6x/kernel/irq.c | 2 +- arch/ia64/kernel/irq.c | 2 +- arch/m68k/include/asm/hardirq.h | 2 +- arch/mips/kernel/irq.c | 2 +- arch/mn10300/kernel/irq.c | 2 +- arch/parisc/include/asm/hardirq.h | 2 +- arch/powerpc/include/asm/hardirq.h | 2 +- arch/s390/include/asm/hardirq.h | 2 +- arch/sh/kernel/irq.c | 2 +- arch/tile/kernel/irq.c | 2 +- arch/x86/kernel/irq.c | 2 +- include/asm-generic/hardirq.h | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/alpha/kernel/irq.c b/arch/alpha/kernel/irq.c index 51f2c86..9acdc14 100644 --- a/arch/alpha/kernel/irq.c +++ b/arch/alpha/kernel/irq.c @@ -34,7 +34,7 @@ DEFINE_PER_CPU(unsigned long, irq_pmi_count); void ack_bad_irq(unsigned int irq) { irq_err_count++; - printk(KERN_CRIT "Unexpected IRQ trap at vector %u\n", irq); + printk(KERN_CRIT "Unexpected IRQ %d\n", irq); } #ifdef CONFIG_SMP diff --git a/arch/blackfin/kernel/irqchip.c b/arch/blackfin/kernel/irqchip.c index 0ba2576..608741e 100644 --- a/arch/blackfin/kernel/irqchip.c +++ b/arch/blackfin/kernel/irqchip.c @@ -20,7 +20,7 @@ static atomic_t irq_err_count; void ack_bad_irq(unsigned int irq) { atomic_inc(&irq_err_count); - printk(KERN_ERR "IRQ: spurious interrupt %d\n", irq); + printk(KERN_ERR "unexpected IRQ %d\n", irq); } static struct irq_desc bad_irq_desc = { diff --git a/arch/c6x/kernel/irq.c b/arch/c6x/kernel/irq.c index 247e0eb..cd7fb55 100644 --- a/arch/c6x/kernel/irq.c +++ b/arch/c6x/kernel/irq.c @@ -120,7 +120,7 @@ void __init init_IRQ(void) void ack_bad_irq(int irq) { - printk(KERN_ERR "IRQ: spurious interrupt %d\n", irq); + printk(KERN_ERR "unexpected IRQ %d\n", irq); irq_err_count++; } diff --git a/arch/ia64/kernel/irq.c b/arch/ia64/kernel/irq.c index 812a1e6..b198c69 100644 --- a/arch/ia64/kernel/irq.c +++ b/arch/ia64/kernel/irq.c @@ -31,7 +31,7 @@ */ void ack_bad_irq(unsigned int irq) { - printk(KERN_ERR "Unexpected irq vector 0x%x on CPU %u!\n", irq, smp_processor_id()); + printk(KERN_ERR "unexpected IRQ %d on CPU %u!\n", irq, smp_processor_id()); } #ifdef CONFIG_IA64_GENERIC diff --git a/arch/m68k/include/asm/hardirq.h b/arch/m68k/include/asm/hardirq.h index 6c61852..5f0fe98 100644 --- a/arch/m68k/include/asm/hardirq.h +++ b/arch/m68k/include/asm/hardirq.h @@ -9,7 +9,7 @@ static inline void ack_bad_irq(unsigned int irq) { - pr_crit("unexpected IRQ trap at vector %02x\n", irq); + pr_crit("unexpected IRQ %d\n", irq); } /* entry.S is sensitive to the offsets of these fields */ diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c index 8eb5af8..f6b9ce9 100644 --- a/arch/mips/kernel/irq.c +++ b/arch/mips/kernel/irq.c @@ -31,7 +31,7 @@ */ void ack_bad_irq(unsigned int irq) { - printk("unexpected IRQ # %d\n", irq); + printk("unexpected IRQ %d\n", irq); } atomic_t irq_err_count; diff --git a/arch/mn10300/kernel/irq.c b/arch/mn10300/kernel/irq.c index 480de70..c7b780d 100644 --- a/arch/mn10300/kernel/irq.c +++ b/arch/mn10300/kernel/irq.c @@ -197,7 +197,7 @@ static struct irq_chip mn10300_cpu_pic_edge = { */ void ack_bad_irq(int irq) { - printk(KERN_WARNING "unexpected IRQ trap at vector %02x\n", irq); + printk(KERN_WARNING "unexpected IRQ %d\n", irq); } /* diff --git a/arch/parisc/include/asm/hardirq.h b/arch/parisc/include/asm/hardirq.h index 9b3bd03..c093c4f 100644 --- a/arch/parisc/include/asm/hardirq.h +++ b/arch/parisc/include/asm/hardirq.h @@ -41,6 +41,6 @@ DECLARE_PER_CPU_SHARED_ALIGNED(irq_cpustat_t, irq_stat); this_cpu_write(irq_stat.__softirq_pending, (x)) #define or_softirq_pending(x) this_cpu_or(irq_stat.__softirq_pending, (x)) -#define ack_bad_irq(irq) WARN(1, "unexpected IRQ trap at vector %02x\n", irq) +#define ack_bad_irq(irq) WARN(1, "unexpected IRQ %d\n", irq) #endif /* _PARISC_HARDIRQ_H */ diff --git a/arch/powerpc/include/asm/hardirq.h b/arch/powerpc/include/asm/hardirq.h index 8add8b8..aa8ebbb 100644 --- a/arch/powerpc/include/asm/hardirq.h +++ b/arch/powerpc/include/asm/hardirq.h @@ -30,7 +30,7 @@ DECLARE_PER_CPU_SHARED_ALIGNED(irq_cpustat_t, irq_stat); static inline void ack_bad_irq(unsigned int irq) { - printk(KERN_CRIT "unexpected IRQ trap at vector %02x\n", irq); + printk(KERN_CRIT "unexpected IRQ %d\n", irq); } extern u64 arch_irq_stat_cpu(unsigned int cpu); diff --git a/arch/s390/include/asm/hardirq.h b/arch/s390/include/asm/hardirq.h index b7eabaa..08eeacd 100644 --- a/arch/s390/include/asm/hardirq.h +++ b/arch/s390/include/asm/hardirq.h @@ -20,7 +20,7 @@ static inline void ack_bad_irq(unsigned int irq) { - printk(KERN_CRIT "unexpected IRQ trap at vector %02x\n", irq); + printk(KERN_CRIT "unexpected IRQ %d\n", irq); } #endif /* __ASM_HARDIRQ_H */ diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c index eb10ff8..093e434 100644 --- a/arch/sh/kernel/irq.c +++ b/arch/sh/kernel/irq.c @@ -30,7 +30,7 @@ atomic_t irq_err_count; void ack_bad_irq(unsigned int irq) { atomic_inc(&irq_err_count); - printk("unexpected IRQ trap at vector %02x\n", irq); + printk("unexpected IRQ %d\n", irq); } #if defined(CONFIG_PROC_FS) diff --git a/arch/tile/kernel/irq.c b/arch/tile/kernel/irq.c index 22044fc..c8e4f88 100644 --- a/arch/tile/kernel/irq.c +++ b/arch/tile/kernel/irq.c @@ -250,7 +250,7 @@ EXPORT_SYMBOL(tile_irq_activate); void ack_bad_irq(unsigned int irq) { - pr_err("unexpected IRQ trap at vector %02x\n", irq); + pr_err("unexpected IRQ %d\n", irq); } /* diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c index 3c6b069..a0d46d2 100644 --- a/arch/x86/kernel/irq.c +++ b/arch/x86/kernel/irq.c @@ -40,7 +40,7 @@ void (*x86_platform_ipi_callback)(void) = NULL; void ack_bad_irq(unsigned int irq) { if (printk_ratelimit()) - pr_err("unexpected IRQ trap at vector %02x\n", irq); + pr_err("unexpected IRQ %d\n", irq); /* * Currently unexpected vectors happen only on SMP and APIC. diff --git a/include/asm-generic/hardirq.h b/include/asm-generic/hardirq.h index 04d0a97..516ff5f 100644 --- a/include/asm-generic/hardirq.h +++ b/include/asm-generic/hardirq.h @@ -14,7 +14,7 @@ typedef struct { #ifndef ack_bad_irq static inline void ack_bad_irq(unsigned int irq) { - printk(KERN_CRIT "unexpected IRQ trap at vector %02x\n", irq); + printk(KERN_CRIT "unexpected IRQ %d\n", irq); } #endif