aboutsummaryrefslogtreecommitdiffstats
path: root/xen/common/grant_table.c
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@suse.com>2011-11-24 09:44:54 +0100
committerJan Beulich <jbeulich@suse.com>2011-11-24 09:44:54 +0100
commitd0d0ded0b6e45882eb2478179c222bdad56a300a (patch)
tree64fa2cff054ce0176db236e5c94cdb2f44cf011c /xen/common/grant_table.c
parentd7e49b1fe4573eb98c2e9710a9c97d172a18f61e (diff)
downloadxen-d0d0ded0b6e45882eb2478179c222bdad56a300a.tar.gz
xen-d0d0ded0b6e45882eb2478179c222bdad56a300a.tar.bz2
xen-d0d0ded0b6e45882eb2478179c222bdad56a300a.zip
ia64: build fixes (again)
This undoes a single change from c/s 24136:3622d7fae14d (common/grant_table.c) and several from c/s 24100:be8daf78856a (common/memory.c). It also completes the former with two previously missing ia64 specific code adjustments. Authors Cc-ed. Signed-off-by: Jan Beulich <jbeulich@suse.com> Acked-by: Andres Lagar-Cavilla <andres@lagarcavilla.org>
Diffstat (limited to 'xen/common/grant_table.c')
-rw-r--r--xen/common/grant_table.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c
index c80a35975e..6ffd6079d9 100644
--- a/xen/common/grant_table.c
+++ b/xen/common/grant_table.c
@@ -173,7 +173,7 @@ static int __get_paged_frame(unsigned long gfn, unsigned long *frame, int readon
rc = GNTST_bad_page;
}
#else
- *frame = readonly ? get_gfn_untyped(rd, gfn) : gfn_to_mfn_private(rd, gfn);
+ *frame = readonly ? gmfn_to_mfn(rd, gfn) : gfn_to_mfn_private(rd, gfn);
#endif
return rc;