# HG changeset patch
# User mafetter@fleming.research
# Date 1097506363 0
# Node ID 4d484af4aca08199d6324eec31bacb93e48c7ad3
# Parent  9402048e2325437c6179d47b49c2835b1b89a7c6
bitkeeper revision 1.1159.1.219 (416a9e3bO5_6f1e0AMMNVRk0kCNWpQ)

Bug fix, from code inspection.

MMUEXT_TRANSFER_PAGE error case would have inappropriately caused an
ASSERT, due to a "break" statement getting caught by a while loop, rather
than the intended switch statement.


diff -r 9402048e2325 -r 4d484af4aca0 BitKeeper/etc/logging_ok
--- a/BitKeeper/etc/logging_ok	Mon Oct 11 12:48:40 2004 +0000
+++ b/BitKeeper/etc/logging_ok	Mon Oct 11 14:52:43 2004 +0000
@@ -30,6 +30,7 @@ kaf24@scramble.cl.cam.ac.uk
 kaf24@striker.cl.cam.ac.uk
 laudney@eclipse.(none)
 lynx@idefix.cl.cam.ac.uk
+mafetter@fleming.research
 maw48@labyrinth.cl.cam.ac.uk
 mjw@wray-m-3.hpl.hp.com
 mwilli2@equilibrium.research
diff -r 9402048e2325 -r 4d484af4aca0 xen/arch/x86/memory.c
--- a/xen/arch/x86/memory.c	Mon Oct 11 12:48:40 2004 +0000
+++ b/xen/arch/x86/memory.c	Mon Oct 11 14:52:43 2004 +0000
@@ -1156,6 +1156,7 @@ static int do_extended_command(unsigned 
                 : "0" (d), "1" (x), "c" (NULL), "b" (x) );
         } 
         while ( unlikely(nd != d) || unlikely(y != x) );
+	if (!okay) break;
 
         /*
          * Unlink from 'd'. At least one reference remains (now anonymous), so