From mboxrd@z Thu Jan  1 00:00:00 1970
From: George Dunlap <george.dunlap@citrix.com>
Subject: Re: 4.0-testing c/s 21405 incomplete?
Date: Mon, 07 Feb 2011 14:34:50 +0000
Message-ID: <1297089290.1903.235.camel@elijah>
References: <4D493A37020000780002FE60@vpn.id2.novell.com>
	<C974861A.2AC41%keir@xen.org>
	<4D4FB1460200007800030777@vpn.id2.novell.com>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="=-3WDzMzH5g4dleSwn3w+6"
Return-path: <xen-devel-bounces@lists.xensource.com>
In-Reply-To: <4D4FB1460200007800030777@vpn.id2.novell.com>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: Jan Beulich <JBeulich@novell.com>
Cc: George Dunlap <George.Dunlap@eu.citrix.com>, "xen-devel@lists.xensource.com" <xen-devel@lists.xensource.com>, Keir Fraser <keir@xen.org>
List-Id: xen-devel@lists.xenproject.org


--=-3WDzMzH5g4dleSwn3w+6
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit

On Mon, 2011-02-07 at 07:45 +0000, Jan Beulich wrote:
> > The xen-unstable and xen-4.0-testing patches are merely plucked by me from
> > postings by George from the following xen-devel thread:
> > 
> > http://lists.xensource.com/archives/html/xen-devel/2010-12/msg00830.html 
> 
> Ah, okay - I think the patch there wasn't against 4.0-testing, but
> against plain 4.0.x, so it's missing the revert of 4.0-testing c/s
> 21334.

Right -- I'm not exactly sure why that bit was left off my 4.0 patch,
but it certainly shouldn't have been.

Keir, can you please apply the attached patch to 4.0-testing.

 -George


--=-3WDzMzH5g4dleSwn3w+6
Content-Disposition: attachment; filename="xen-4.0-remove-ept-get-lock.diff"
Content-Type: text/x-patch; name="xen-4.0-remove-ept-get-lock.diff";
	charset="UTF-8"
Content-Transfer-Encoding: 7bit

diff -r f7f6fa8665e7 xen/arch/x86/mm/hap/p2m-ept.c
--- a/xen/arch/x86/mm/hap/p2m-ept.c	Thu Feb 03 11:56:05 2011 +0000
+++ b/xen/arch/x86/mm/hap/p2m-ept.c	Mon Feb 07 14:34:20 2011 +0000
@@ -395,10 +395,6 @@
     int i;
     int ret = 0;
     mfn_t mfn = _mfn(INVALID_MFN);
-    int do_locking = !p2m_locked_by_me(d->arch.p2m);
-
-    if ( do_locking )
-        p2m_lock(d->arch.p2m);
 
     *t = p2m_mmio_dm;
 
@@ -476,8 +472,6 @@
     }
 
 out:
-    if ( do_locking )
-        p2m_unlock(d->arch.p2m);
     unmap_domain_page(table);
     return mfn;
 }

--=-3WDzMzH5g4dleSwn3w+6
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

--=-3WDzMzH5g4dleSwn3w+6--