Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763554AbYAaTxT (ORCPT ); Thu, 31 Jan 2008 14:53:19 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754618AbYAaTxH (ORCPT ); Thu, 31 Jan 2008 14:53:07 -0500 Received: from gw.goop.org ([64.81.55.164]:37176 "EHLO mail.goop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754585AbYAaTxH (ORCPT ); Thu, 31 Jan 2008 14:53:07 -0500 Message-ID: <47A2270B.9050207@goop.org> Date: Thu, 31 Jan 2008 11:52:43 -0800 From: Jeremy Fitzhardinge User-Agent: Thunderbird 2.0.0.9 (X11/20071115) MIME-Version: 1.0 To: Ian Campbell CC: Ingo Molnar , LKML , Andi Kleen , Jan Beulich , Eduardo Pereira Habkost , H Peter Anvin Subject: Re: [PATCH 04 of 11] x86: fix early_ioremap pagetable ops References: <1201806096.20036.43.camel@cthulhu.hellion.org.uk> In-Reply-To: <1201806096.20036.43.camel@cthulhu.hellion.org.uk> X-Enigmail-Version: 0.95.6 Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1792 Lines: 56 Ian Campbell wrote: > > This seems to have ended up in f6df72e71eba621b2f5c49b3a763116fac748f6e > as: > + paravirt_release_pt(__pa(pmd) >> PAGE_SHIFT); > > and the pmd_populate_kernel hunk is missing altogether. > > --- > >From bfa2a08064a269dd7906ed5f60e436360e1360e7 Mon Sep 17 00:00:00 2001 > From: Ian Campbell > Date: Thu, 31 Jan 2008 18:56:06 +0000 > Subject: [PATCH] x86: fix early_ioremap pagetable ops for paravirt. > > Some important parts of f6df72e71eba621b2f5c49b3a763116fac748f6e got dropped > along the way, reintroduce them. > Yep. Acked-by: Jeremy Fitzhardinge > Signed-off-by: Ian Campbell > --- > arch/x86/mm/ioremap.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c > index ed4208e..93d931e 100644 > --- a/arch/x86/mm/ioremap.c > +++ b/arch/x86/mm/ioremap.c > @@ -302,7 +302,7 @@ void __init early_ioremap_init(void) > > pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN)); > memset(bm_pte, 0, sizeof(bm_pte)); > - set_pmd(pmd, __pmd(__pa(bm_pte) | _PAGE_TABLE)); > + pmd_populate_kernel(&init_mm, pmd, bm_pte); > > /* > * The boot-ioremap range spans multiple pmds, for which > @@ -332,7 +332,7 @@ void __init early_ioremap_clear(void) > > pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN)); > pmd_clear(pmd); > - paravirt_release_pt(__pa(pmd) >> PAGE_SHIFT); > + paravirt_release_pt(__pa(bm_pte) >> PAGE_SHIFT); > __flush_tlb_all(); > } > > -- 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/