[Xen-devel] [PV-onHVM][PATCH 3/3] Fix bad symbol reference

[Ben Guthro <bguthro@xxxxxxxxxxxxxxx>]

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@xxxxxxxxxxxxxxx>
Signed-off-by: Dave Lively <dlively@xxxxxxxxxxxxxxx>

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);

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