Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030334AbXAEEfn (ORCPT ); Thu, 4 Jan 2007 23:35:43 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1030315AbXAEEfg (ORCPT ); Thu, 4 Jan 2007 23:35:36 -0500 Received: from mailout1.vmware.com ([65.113.40.130]:51911 "EHLO mailout1.vmware.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030317AbXAEEfd (ORCPT ); Thu, 4 Jan 2007 23:35:33 -0500 Date: Thu, 4 Jan 2007 20:35:30 -0800 Message-Id: <200701050435.l054ZUWn005547@zach-dev.vmware.com> Subject: [PATCH 3/3] Vmi native fix From: Zachary Amsden To: Andrew Morton , Rusty Russell , Andi Kleen , Jeremy Fitzhardinge , Chris Wright , Virtualization Mailing List , Linux Kernel Mailing List , Eli Collins , Zachary Amsden X-OriginalArrivalTime: 05 Jan 2007 04:35:30.0547 (UTC) FILETIME=[EE504C30:01C73082] Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 994 Lines: 25 In paravirt builds with VMI compiled in, vmi_bringup is called unconditionally, not via a paravirt-ops table (as no other hypervisor uses the APIC startup technique). Make the calls to setup VMI state conditional on the presence of the VMI ROM. Signed-off-by: Zachary Amsden diff -r 1915e2685a3c arch/i386/kernel/vmi.c --- a/arch/i386/kernel/vmi.c Thu Jan 04 15:56:40 2007 -0800 +++ b/arch/i386/kernel/vmi.c Thu Jan 04 15:57:38 2007 -0800 @@ -645,7 +645,8 @@ void vmi_bringup(void) void vmi_bringup(void) { /* We must establish the lowmem mapping for MMU ops to work */ - vmi_ops.set_linear_mapping(0, __PAGE_OFFSET, max_low_pfn, 0); + if (vmi_rom) + vmi_ops.set_linear_mapping(0, __PAGE_OFFSET, max_low_pfn, 0); } /* - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/