[Xen-changelog] [xen-unstable] [IA64] fix merge error

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User awilliam@xxxxxxxxxxx
# Node ID dbfd94442e46ea151bc3e129838a4b1273ddf0c0
# Parent  d6e40274f9233a747d5c2f845b086b1f5001521b
[IA64] fix merge error

Fix cut-n-paste error from manually merging patch

Signed-off-by: Alex Williamson <alex.williamson@xxxxxx>
---
 xen/arch/ia64/xen/mm.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff -r d6e40274f923 -r dbfd94442e46 xen/arch/ia64/xen/mm.c
--- a/xen/arch/ia64/xen/mm.c    Fri Nov 10 12:37:34 2006 -0700
+++ b/xen/arch/ia64/xen/mm.c    Fri Nov 10 12:55:52 2006 -0700
@@ -1717,7 +1717,7 @@ domain_page_flush_and_put(struct domain*
          * Probably the domain did only DMA.
          */
         /* do nothing */
-        put_page(page)
+        put_page(page);
         break;
     case TLB_TRACK_FOUND:
         // dprintk(XENLOG_WARNING, "%s TLB_TRACK_FOUND\n", __func__);
@@ -1728,7 +1728,7 @@ domain_page_flush_and_put(struct domain*
          */
         domain_flush_vtlb_track_entry(d, entry);
         tlb_track_free_entry(d->arch.tlb_track, entry);
-        put_page(page)
+        put_page(page);
         break;
     case TLB_TRACK_MANY:
         gdprintk(XENLOG_INFO, "%s TLB_TRACK_MANY\n", __func__);
@@ -1740,7 +1740,7 @@ domain_page_flush_and_put(struct domain*
          * full vTLB flush is necessary.
          */
         domain_flush_vtlb_all();
-        put_page(page)
+        put_page(page);
         break;
     case TLB_TRACK_AGAIN:
         gdprintk(XENLOG_ERR, "%s TLB_TRACK_AGAIN\n", __func__);

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