Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753628AbdHWIac (ORCPT ); Wed, 23 Aug 2017 04:30:32 -0400 Received: from terminus.zytor.com ([65.50.211.136]:32859 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753520AbdHWIaa (ORCPT ); Wed, 23 Aug 2017 04:30:30 -0400 Date: Wed, 23 Aug 2017 01:25:08 -0700 From: tip-bot for raymond pang Message-ID: Cc: hpa@zytor.com, peterz@infradead.org, raymondpangxd@gmail.com, mingo@kernel.org, tglx@linutronix.de, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org Reply-To: torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, raymondpangxd@gmail.com, hpa@zytor.com, peterz@infradead.org, mingo@kernel.org, tglx@linutronix.de In-Reply-To: References: To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/apic] x86/ioapic: Print the IRTE's index field correctly when enabling INTR Git-Commit-ID: adfaf18334cbf16c563e4ebc67e968ea1b17ec51 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1734 Lines: 41 Commit-ID: adfaf18334cbf16c563e4ebc67e968ea1b17ec51 Gitweb: http://git.kernel.org/tip/adfaf18334cbf16c563e4ebc67e968ea1b17ec51 Author: raymond pang AuthorDate: Tue, 22 Aug 2017 23:44:47 +0800 Committer: Ingo Molnar CommitDate: Wed, 23 Aug 2017 10:17:17 +0200 x86/ioapic: Print the IRTE's index field correctly when enabling INTR When enabling interrupt remap, IOAPIC's RTE contains the interrupt_index field of IRTE. This field is composed of the ->index and the ->index2 members of 'struct IR_IO_APIC_route_entry' - but what we print out currently only uses ->index. Fix it. Signed-off-by: Raymond Pang Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: joro@8bytes.org Cc: linux-arch@vger.kernel.org Link: http://lkml.kernel.org/r/CAHG4imNDzpDyOVi7MByVrLQ%3DQFuOVqpzJ5F-Xs5z6OZphubj-Q@mail.gmail.com Signed-off-by: Ingo Molnar --- arch/x86/kernel/apic/io_apic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index 237e9c2..70e48aa 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -1243,7 +1243,7 @@ static void io_apic_print_entries(unsigned int apic, unsigned int nr_entries) entry.vector, entry.irr, entry.delivery_status); if (ir_entry->format) printk(KERN_DEBUG "%s, remapped, I(%04X), Z(%X)\n", - buf, (ir_entry->index << 15) | ir_entry->index, + buf, (ir_entry->index2 << 15) | ir_entry->index, ir_entry->zero); else printk(KERN_DEBUG "%s, %s, D(%02X), M(%1d)\n",