From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753026AbcHOKOT (ORCPT ); Mon, 15 Aug 2016 06:14:19 -0400 Received: from terminus.zytor.com ([198.137.202.10]:53568 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752863AbcHOKOS (ORCPT ); Mon, 15 Aug 2016 06:14:18 -0400 Date: Mon, 15 Aug 2016 03:11:56 -0700 From: tip-bot for Baoquan He Message-ID: Cc: peterz@infradead.org, jpoimboe@redhat.com, mingo@kernel.org, hpa@zytor.com, bp@alien8.de, dvlasenk@redhat.com, tglx@linutronix.de, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, luto@kernel.org, brgerst@gmail.com, bhe@redhat.com Reply-To: jpoimboe@redhat.com, mingo@kernel.org, hpa@zytor.com, peterz@infradead.org, tglx@linutronix.de, torvalds@linux-foundation.org, dvlasenk@redhat.com, bp@alien8.de, linux-kernel@vger.kernel.org, luto@kernel.org, brgerst@gmail.com, bhe@redhat.com In-Reply-To: <1470986507-24191-1-git-send-email-bhe@redhat.com> References: <1470986507-24191-1-git-send-email-bhe@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/apic] x86/apic, ACPI: Fix incorrect assignment when handling apic/x2apic entries Git-Commit-ID: 31b02dd718712f4c45afbeea7fbd187ecb1b202c 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 Commit-ID: 31b02dd718712f4c45afbeea7fbd187ecb1b202c Gitweb: http://git.kernel.org/tip/31b02dd718712f4c45afbeea7fbd187ecb1b202c Author: Baoquan He AuthorDate: Fri, 12 Aug 2016 15:21:47 +0800 Committer: Ingo Molnar CommitDate: Mon, 15 Aug 2016 08:53:44 +0200 x86/apic, ACPI: Fix incorrect assignment when handling apic/x2apic entries By pure accident the bug makes no functional difference, because the only expression where we are using these values is (!count && !x2count), in which the variables are interchangeable, but it makes sense to fix the bug nevertheless. Signed-off-by: Baoquan He Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-acpi@vger.kernel.org Cc: rjw@rjwysocki.net Link: http://lkml.kernel.org/r/1470986507-24191-1-git-send-email-bhe@redhat.com Signed-off-by: Ingo Molnar --- arch/x86/kernel/acpi/boot.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 2087bea..1ad5fe2 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@ -1018,8 +1018,8 @@ static int __init acpi_parse_madt_lapic_entries(void) return ret; } - x2count = madt_proc[0].count; - count = madt_proc[1].count; + count = madt_proc[0].count; + x2count = madt_proc[1].count; } if (!count && !x2count) { printk(KERN_ERR PREFIX "No LAPIC entries present\n");