xen-changelog

[Top] [All Lists]

[Xen-changelog] Relax BUG_ON() state ment in increase_reservation() in b

from [Xen patchbot -unstable]

[Permanent Link][Original]

To:	xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject:	[Xen-changelog] Relax BUG_ON() state ment in increase_reservation() in balloon.c.
From:	Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date:	Fri, 28 Apr 2006 16:14:08 +0000
Delivery-date:	Fri, 28 Apr 2006 09:15:13 -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 kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 8bf5637cb269ba6bbc2a712824d2982930224405
# Parent  e0d986fc0978710c168ea139a3359ca0c7270839
Relax BUG_ON() state ment in increase_reservation() in balloon.c.
When xen_feature(XENFEAT_auto_translated_physmap) = 1,
phys_to_machine_mapping_valid(pfn) always returns true.
Relaxed BUG_ON() for xen_feature(XENFEAT_auto_translated_physmap) = 1 case.

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>

diff -r e0d986fc0978 -r 8bf5637cb269 
linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c
--- a/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c        Thu Apr 27 
19:19:59 2006 +0100
+++ b/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c        Fri Apr 28 
08:30:52 2006 +0100
@@ -216,7 +216,8 @@ static int increase_reservation(unsigned
                BUG_ON(page == NULL);
 
                pfn = page_to_pfn(page);
-               BUG_ON(phys_to_machine_mapping_valid(pfn));
+               BUG_ON(!xen_feature(XENFEAT_auto_translated_physmap) &&
+                      phys_to_machine_mapping_valid(pfn));
 
                /* Update P->M and M->P tables. */
                set_phys_to_machine(pfn, frame_list[i]);

_______________________________________________
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] Relax BUG_ON() state ment in increase_reservation() in balloon.c., Xen patchbot -unstable <=

Previous by Date:	[Xen-changelog] Fix Xen's interrupt acknowledgement routines on certain, Xen patchbot -3 . 0-testing
Next by Date:	[Xen-changelog] Rename {SG}ET_XEN_GUEST_HANDLE to {sg}et_Xen_guest_handle, as they, Xen patchbot -unstable
Previous by Thread:	[Xen-changelog] Fix memory_op hypercall mlock/munlock wrapping after the, Xen patchbot -unstable
Next by Thread:	[Xen-changelog] Rename {SG}ET_XEN_GUEST_HANDLE to {sg}et_Xen_guest_handle, as they, Xen patchbot -unstable
Indexes:	[Date] [Thread] [Top] [All Lists]