xen-changelog

[Top] [All Lists]

[Xen-changelog] [xen-unstable] Fix hvm balloon driver; missed this hunk

from [Xen patchbot-unstable]

[Permanent Link][Original]

To:	xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject:	[Xen-changelog] [xen-unstable] Fix hvm balloon driver; missed this hunk in last checkin.
From:	Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date:	Thu, 05 Apr 2007 06:50:07 -0700
Delivery-date:	Thu, 05 Apr 2007 06:49:41 -0700
Envelope-to:	www-data@xxxxxxxxxxxxxxxxxx
List-help:	<mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id:	BK change log <xen-changelog.lists.xensource.com>
List-post:	<mailto:xen-changelog@lists.xensource.com>
List-subscribe:	<http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe:	<http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to:	xen-devel@xxxxxxxxxxxxxxxxxxx
Sender:	xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx

# HG changeset patch
# User Steven Hand <steven@xxxxxxxxxxxxx>
# Date 1175757896 -3600
# Node ID 768a4fe105e80213054bf489993aac1a00ecfe80
# Parent  adf7f391be7128686ddd0a8f2ed9a2c6b01e4d3d
Fix hvm balloon driver; missed this hunk in last checkin.

Signed-off-by: Steven Hand <steven@xxxxxxxxxxxxx>
---
 linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c |    2 ++
 1 files changed, 2 insertions(+)

diff -r adf7f391be71 -r 768a4fe105e8 
linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c
--- a/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c        Thu Apr 05 
06:51:53 2007 +0100
+++ b/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c        Thu Apr 05 
08:24:56 2007 +0100
@@ -276,9 +276,11 @@ static int decrease_reservation(unsigned
                if (!PageHighMem(page)) {
                        v = phys_to_virt(pfn << PAGE_SHIFT);
                        scrub_pages(v, 1);
+#ifdef CONFIG_XEN
                        ret = HYPERVISOR_update_va_mapping(
                                (unsigned long)v, __pte_ma(0), 0);
                        BUG_ON(ret);
+#endif
                }
 #ifdef CONFIG_XEN_SCRUB_PAGES
                else {

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

[More with this subject...]

<Prev in Thread]	Current Thread	[Next in Thread>
[Xen-changelog] [xen-unstable] Fix hvm balloon driver; missed this hunk in last checkin., Xen patchbot-unstable <=

Previous by Date:	[Xen-changelog] [xen-unstable] xen: Fix typo in ns16550 driver., Xen patchbot-unstable
Next by Date:	[Xen-changelog] [xen-unstable] hvm: MMIO decoder rename local variable 'diff' to 'result'., Xen patchbot-unstable
Previous by Thread:	[Xen-changelog] [xen-unstable] xen: Fix typo in ns16550 driver., Xen patchbot-unstable
Next by Thread:	[Xen-changelog] [xen-unstable] hvm: MMIO decoder rename local variable 'diff' to 'result'., Xen patchbot-unstable
Indexes:	[Date] [Thread] [Top] [All Lists]