[PATCH] trivial compilation error fix for 17645:8d18e52a1b23 (was Re: [Xen-devel][PATCH] patch to support super page (2M) with EPT)

[Isaku Yamahata <yamahata@xxxxxxxxxxxxx>]

# HG changeset patch
# User Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
# Date 1210906165 -32400
# Node ID 6d6e35e53f46768bda3a642dd94fff4ed9be8108
# Parent  f12724194ec6768baf865dc2d54afe646dbeac79
[IA64] trivial compilation error fix for 17645:8d18e52a1b23.

This patch fixes copilation errors cauased by c/s 17645:8d18e52a1b23.

mm.c: In function 'guest_physmap_remove_page':
mm.c:2455: error: invalid storage class for function 'domain_page_flush_and_put'
mm.c:2451: warning: ISO C90 forbids mixed declarations and code
mm.c:2597: error: invalid storage class for function 'free_page_type'
mm.c:2601: error: invalid storage class for function 'alloc_page_type'
mm.c:2913: error: expected declaration or statement at end of input

and

xen/include/asm/shadow.h:44: error: conflicting types for guest_physmap_add_page
xen/include/asm/grant_table.h:16: error: previous declaration of 
guest_physmap_add_page was here

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>

diff --git a/xen/arch/ia64/xen/mm.c b/xen/arch/ia64/xen/mm.c
--- a/xen/arch/ia64/xen/mm.c
+++ b/xen/arch/ia64/xen/mm.c
@@ -2442,7 +2442,7 @@
 
     BUG_ON(mfn == 0);//XXX
 
-    for (i = 0; i < (1UL << page_order); i++) {
+    for (i = 0; i < (1UL << page_order); i++)
         zap_domain_page_one(d, (gpfn+i) << PAGE_SHIFT, 0, mfn+i);
 
     perfc_incr(guest_physmap_remove_page);
diff --git a/xen/include/asm-ia64/grant_table.h 
b/xen/include/asm-ia64/grant_table.h
--- a/xen/include/asm-ia64/grant_table.h
+++ b/xen/include/asm-ia64/grant_table.h
@@ -13,7 +13,7 @@
 int replace_grant_host_mapping(unsigned long gpaddr, unsigned long mfn, 
unsigned long new_gpaddr, unsigned int flags);
 
 // for grant transfer
-int guest_physmap_add_page(struct domain *d, unsigned long gpfn, unsigned long 
mfn, int order);
+int guest_physmap_add_page(struct domain *d, unsigned long gpfn, unsigned long 
mfn, unsigned int page_order);
 
 /* XXX
  * somewhere appropriate


-- 
yamahata

Attachment: 17648_6d6e35e53f46.patch
Description: Text Data

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