From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ben Guthro <bguthro@virtualiron.com>
Subject: [PV-onHVM][PATCH 3/3] Fix bad symbol reference
Date: Thu, 06 Sep 2007 13:43:55 -0400
Message-ID: <46E03C5B.40500@virtualiron.com>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="------------090501010906090208080806"
Return-path: <xen-devel-bounces@lists.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/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/cgi-bin/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, Dave Lively <dlively@virtualiron.com>
List-Id: xen-devel@lists.xenproject.org

This is a multi-part message in MIME format.

--------------090501010906090208080806
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

This fixes a bug causing a bogus symbol reference (to init_page_count) 
in the PV-on-HVM drivers for 2.6 kernels that define the set_page_count 
macro.

Signed-off-by: Ben Guthro <bguthro@virtualiron.com>
Signed-off-by: Dave Lively <dlively@virtualiron.com>

--------------090501010906090208080806
Content-Type: text/x-patch;
 name="xen-legacy-gnttab-fix.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="xen-legacy-gnttab-fix.patch"

diff -r e2956856259c include/xen/gnttab.h
--- a/include/xen/gnttab.h	Tue Sep 04 13:49:56 2007 -0400
+++ b/include/xen/gnttab.h	Tue Sep 04 15:16:47 2007 -0400
@@ -108,11 +108,15 @@ static inline void __gnttab_dma_unmap_pa
 {
 }
 
-static inline void gnttab_reset_grant_page(struct page *page)
-{
-	init_page_count(page);
-	reset_page_mapcount(page);
-}
+/* init_page_count() is conditionally redefined by xen/platform-compat.h, so
+ * we can't inline a call to it.
+ */
+#define gnttab_reset_grant_page(p)		\
+	do {					\
+		struct page *_page = p;	        \
+		init_page_count(_page);		\
+		reset_page_mapcount(_page);	\
+	} while (0);				\
 
 int gnttab_suspend(void);
 int gnttab_resume(void);

--------------090501010906090208080806
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

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

--------------090501010906090208080806--