Attachment 311833 Details for Bug 455429 – Upstream fix for this issue

[patch] Upstream fix for this issue

388 (text/plain), 3.71 KB, created by Prarit Bhargava on 2008-07-15 14:12:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Prarit Bhargava

Created: 2008-07-15 14:12:16 UTC

Size: 3.71 KB

patch

obsolete

>Return-path: <git-commits-head-owner@vger.kernel.org>
>Envelope-to: arjan@infradead.org
>Delivery-date: Fri, 18 Apr 2008 17:38:49 +0000
>Received: from vger.kernel.org ([209.132.176.167])
>	by pentafluge.infradead.org with esmtp (Exim 4.68 #1 (Red Hat Linux))
>	id 1JmuXx-0000Rw-5Q
>	for arjan@infradead.org; Fri, 18 Apr 2008 17:38:49 +0000
>Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
>	id S1754607AbYDRRis (ORCPT <rfc822;arjan@infradead.org>);
>	Fri, 18 Apr 2008 13:38:48 -0400
>Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754614AbYDRRis
>	(ORCPT <rfc822;git-commits-head-outgoing>);
>	Fri, 18 Apr 2008 13:38:48 -0400
>Received: from hera.kernel.org ([140.211.167.34]:50048 "EHLO hera.kernel.org"
>	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
>	id S1754607AbYDRRir (ORCPT
>	<rfc822;git-commits-head@vger.kernel.org>);
>	Fri, 18 Apr 2008 13:38:47 -0400
>Received: from hera.kernel.org (localhost [127.0.0.1])
>	by hera.kernel.org (8.13.8/8.13.8) with ESMTP id m3IHciPG010592
>	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)
>	for <git-commits-head@vger.kernel.org>; Fri, 18 Apr 2008 17:38:46 GMT
>Received: (from dwmw2@localhost)
>	by hera.kernel.org (8.13.8/8.13.1/Submit) id m3IHcidL010571
>	for git-commits-head@vger.kernel.org; Fri, 18 Apr 2008 17:38:44 GMT
>Date:	Fri, 18 Apr 2008 17:38:44 GMT
>Message-Id: <200804181738.m3IHcidL010571@hera.kernel.org>
>From:	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
>To:	git-commits-head@vger.kernel.org
>Subject: x86: don't set io apic features if io-apic is not enabled, fix
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>X-Git-Commit: ba1ce61ff226bddebd2101a29fe56b4664ef7cec
>X-Git-Parent: 61048c6328819b0973ef662f6d46f2e2bc753ceb
>X-Spam-Status: No, score=-4.4 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00
>	autolearn=ham version=3.2.3
>X-Spam-Checker-Version:	SpamAssassin 3.2.3 (2007-08-08) on hera.kernel.org
>Sender:	git-commits-head-owner@vger.kernel.org
>Precedence: bulk
>List-ID: <git-commits-head.vger.kernel.org>
>X-Mailing-List:	git-commits-head@vger.kernel.org
>
>Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ba1ce61ff226bddebd2101a29fe56b4664ef7cec
>Commit:     ba1ce61ff226bddebd2101a29fe56b4664ef7cec
>Parent:     61048c6328819b0973ef662f6d46f2e2bc753ceb
>Author:     Ingo Molnar <mingo@elte.hu>
>AuthorDate: Mon Apr 7 13:11:09 2008 +0200
>Committer:  Ingo Molnar <mingo@elte.hu>
>CommitDate: Thu Apr 17 17:41:34 2008 +0200
>
>    x86: don't set io apic features if io-apic is not enabled, fix
>    
>    Signed-off-by: Ingo Molnar <mingo@elte.hu>
>---
> arch/x86/kernel/mpparse_32.c |    8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/arch/x86/kernel/mpparse_32.c b/arch/x86/kernel/mpparse_32.c
>index 09cb778..44f52f6 100644
>--- a/arch/x86/kernel/mpparse_32.c
>+++ b/arch/x86/kernel/mpparse_32.c
>@@ -429,9 +429,9 @@ static int __init smp_read_mpc(struct mp_config_table *mpc)
> 				struct mpc_config_ioapic *m=
> 					(struct mpc_config_ioapic *)mpt;
> 				MP_ioapic_info(m);
>-				mpt+=sizeof(*m);
>-				count+=sizeof(*m);
> #endif
>+				mpt+=sizeof(struct mpc_config_ioapic);
>+				count+=sizeof(struct mpc_config_ioapic);
> 				break;
> 			}
> 			case MP_INTSRC:
>@@ -441,9 +441,9 @@ static int __init smp_read_mpc(struct mp_config_table *mpc)
> 					(struct mpc_config_intsrc *)mpt;
> 
> 				MP_intsrc_info(m);
>-				mpt+=sizeof(*m);
>-				count+=sizeof(*m);
> #endif
>+				mpt+=sizeof(struct mpc_config_intsrc);
>+				count+=sizeof(struct mpc_config_intsrc);
> 				break;
> 			}
> 			case MP_LINTSRC:
>--
>To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
>the body of a message to majordomo@vger.kernel.org
>More majordomo info at  http://vger.kernel.org/majordomo-info.html

Actions: View | Diff

Attachments on bug 455429: 311833