git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
[pandora-kernel.git]
/
arch
/
x86
/
xen
/
mmu.c
diff --git
a/arch/x86/xen/mmu.c
b/arch/x86/xen/mmu.c
index
db3802f
..
2a81838
100644
(file)
--- a/
arch/x86/xen/mmu.c
+++ b/
arch/x86/xen/mmu.c
@@
-1750,7
+1750,7
@@
__init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd,
}
#endif /* CONFIG_X86_64 */
-static void xen_set_fixmap(unsigned idx,
unsigned long
phys, pgprot_t prot)
+static void xen_set_fixmap(unsigned idx,
phys_addr_t
phys, pgprot_t prot)
{
pte_t pte;