# HG changeset patch
# User yamahata@xxxxxxxxxxxxx
# Date 1181203436 -32400
# Node ID 1c4aac883f56c707306b57221c20a0d12549e4ad
# Parent  dc6a6311dd6fd530ca0ea8088fe2f56eb5cd02c1
The type of page frame number (pfn or mfn) is unsigned long in other places.
Use unsigned long for consistency.
PATCHNAME: use_unsigned_long_instead_of_maddr_t_or_paddr_t

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

diff -r dc6a6311dd6f -r 1c4aac883f56 linux-2.6-xen-sparse/drivers/xen/core/gnttab.c
--- a/linux-2.6-xen-sparse/drivers/xen/core/gnttab.c	Thu Jun 07 16:55:44 2007 +0900
+++ b/linux-2.6-xen-sparse/drivers/xen/core/gnttab.c	Thu Jun 07 17:03:56 2007 +0900
@@ -514,9 +514,9 @@ int gnttab_copy_grant_page(grant_ref_t r
 	struct page *new_page;
 	void *new_addr;
 	void *addr;
-	paddr_t pfn;
-	maddr_t mfn;
-	maddr_t new_mfn;
+	unsigned long pfn;
+	unsigned long mfn;
+	unsigned long new_mfn;
 	int err;
 
 	page = *pagep;
@@ -565,7 +565,7 @@ int gnttab_copy_grant_page(grant_ref_t r
 	if (!xen_feature(XENFEAT_auto_translated_physmap)) {
 		set_phys_to_machine(page_to_pfn(new_page), INVALID_P2M_ENTRY);
 
-		mmu.ptr = (new_mfn << PAGE_SHIFT) | MMU_MACHPHYS_UPDATE;
+		mmu.ptr = ((maddr_t)new_mfn << PAGE_SHIFT) | MMU_MACHPHYS_UPDATE;
 		mmu.val = pfn;
 		err = HYPERVISOR_mmu_update(&mmu, 1, NULL, DOMID_SELF);
 		BUG_ON(err);