From mboxrd@z Thu Jan  1 00:00:00 1970
From: Olaf Hering <olaf@aepfle.de>
Subject: [PATCH] audit_p2m: fix syntax errors in disabled debug
	code
Date: Wed, 15 Dec 2010 18:04:49 +0100
Message-ID: <20101215170449.GA29290@aepfle.de>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Return-path: <xen-devel-bounces@lists.xensource.com>
Content-Disposition: inline
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: xen-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org


If P2M_PRINTK is re-defined as ordinary printk,
some (disabled) debug statements will not compile.

Signed-off-by: Olaf Hering <olaf@aepfle.de>

--- xen-unstable.hg-4.1.22544.orig/xen/arch/x86/mm/p2m.c
+++ xen-unstable.hg-4.1.22544/xen/arch/x86/mm/p2m.c
@@ -2002,7 +2002,7 @@ static void audit_p2m(struct p2m_domain
         }
 
         // P2M_PRINTK("OK: mfn=%#lx, gfn=%#lx, p2mfn=%#lx, lp2mfn=%#lx\n",
-        //                mfn, gfn, p2mfn, lp2mfn);
+        //                mfn, gfn, mfn_x(p2mfn), lp2mfn);
     }
 
     spin_unlock(&d->page_alloc_lock);
@@ -2164,7 +2164,7 @@ static void audit_p2m(struct p2m_domain
     //P2M_PRINTK("p2m audit complete\n");
     //if ( orphans_i | orphans_d | mpbad | pmbad )
     //    P2M_PRINTK("p2m audit found %lu orphans (%lu inval %lu debug)\n",
-    //                   orphans_i + orphans_d, orphans_i, orphans_d,
+    //                   orphans_i + orphans_d, orphans_i, orphans_d);
     if ( mpbad | pmbad )
     {
         P2M_PRINTK("p2m audit found %lu odd p2m, %lu bad m2p entries\n",