From patchwork Fri Jan 21 09:20:26 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Bader X-Patchwork-Id: 79816 X-Patchwork-Delegate: apw@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 918D0B70B3 for ; Fri, 21 Jan 2011 20:20:40 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1PgDAT-0005J0-H4; Fri, 21 Jan 2011 09:20:29 +0000 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1PgDAR-0005Iv-MW for kernel-team@lists.ubuntu.com; Fri, 21 Jan 2011 09:20:27 +0000 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1PgDAR-0005en-Js for ; Fri, 21 Jan 2011 09:20:27 +0000 Received: from p5b2e3d06.dip.t-dialin.net ([91.46.61.6] helo=[192.168.2.121]) by hutte.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1PgDAR-0007Bc-H0 for kernel-team@lists.ubuntu.com; Fri, 21 Jan 2011 09:20:27 +0000 Message-ID: <4D394FDA.3010200@canonical.com> Date: Fri, 21 Jan 2011 10:20:26 +0100 From: Stefan Bader User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.13) Gecko/20101208 Lightning/1.0b2 Thunderbird/3.1.7 MIME-Version: 1.0 To: kernel-team@lists.ubuntu.com Subject: Re: [Natty] [PATCH] xen: p2m: correctly initialize partial p2m leave References: <4D3879DD.8000903@canonical.com> <4D3946C7.7040903@canonical.com> In-Reply-To: <4D3946C7.7040903@canonical.com> X-Enigmail-Version: 1.1.2 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com On 01/21/2011 09:41 AM, Stefan Bader wrote: > On 01/20/2011 07:07 PM, Stefan Bader wrote: >> Confirmed on Natty's head of the day that without this patch Natty is still a >> bad place to be for t1.micro instances as they crash quicker than printk can say >> hello to the console. >> >> Same patch sent upstream today and the one-line reply to it was not rude, so I >> would expect it to make its way. But Andy, you might want to take it in advance, >> so we can boot on t1.micro with the next upload. Even if upstream has not got to >> accept it. >> >> -Stefan >> >> > Seems I made a slight foolish mistake in declaring p2m to be a long **, while it > is a long *. Practically it works either way but it introduces rightful compiler > warnings. Not sure this can be amended while in linux-next or needs a second > tiny patch which I am about to do. > > -Stefan > So that would be the fix of the fix. -Stefan From fc26a9b0a6b87ee7d5d7cef77664c0d58bfc9761 Mon Sep 17 00:00:00 2001 From: Stefan Bader Date: Fri, 21 Jan 2011 09:46:07 +0100 Subject: [PATCH 2/2] xen: p2m: Use the correct type for p2m page In "xen: p2m: correctly initialize partial p2m leave" I introduced new compiler warnings by using unsigned long ** instead of unsigned long * for the 3rd level tree structure. Due to the nature of pointers and long this works practically but it should be done right. BugLink: http://bugs.launchpad.net/bugs/686692 Signed-off-by: Stefan Bader --- arch/x86/xen/p2m.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/x86/xen/p2m.c b/arch/x86/xen/p2m.c index c9307ec..ddc81a0 100644 --- a/arch/x86/xen/p2m.c +++ b/arch/x86/xen/p2m.c @@ -247,7 +247,7 @@ void __init xen_build_dynamic_phys_to_machine(void) */ if (unlikely(pfn + P2M_PER_PAGE > max_pfn)) { unsigned long p2midx; - unsigned long **p2m = extend_brk(PAGE_SIZE, PAGE_SIZE); + unsigned long *p2m = extend_brk(PAGE_SIZE, PAGE_SIZE); p2m_init(p2m); for (p2midx = 0; pfn + p2midx < max_pfn; p2midx++) { -- 1.7.0.4