[Xen-devel] [PATCH] ia64: fix linkage error

["KUWAMURA Shin'ya" <kuwa@xxxxxxxxxxxxxx>]

Hi,

19932:c0cb307d927f breaks ia64:
  /xen-unstable.hg/xen/common/built_in.o(.text+0x10912): In function 
`do_grant_table_op':
  /xen-unstable.hg/xen/common/grant_table.c:230: undefined reference to 
`paging_mode_external'
  /xen-unstable.hg/xen/common/built_in.o(.text+0x10f82):
  /xen-unstable.hg/xen/common/grant_table.c:356: undefined reference to 
`paging_mode_external'

IA64 does not have paging_mode_external().

Signed-off-by: KUWAMURA Shin'ya <kuwa@xxxxxxxxxxxxxx>
-- 
  KUWAMURA Shin'ya

# HG changeset patch
# User KUWAMURA Shin'ya <kuwa@xxxxxxxxxxxxxx>
# Date 1247718200 -32400
# Node ID b040d2de8746d81708b7b619d948496325f8fb7e
# Parent  91407452cdb62f427c74e227956dc34a107cab46
ia64: fix linkage error

IA64 does not have paging_mode_external().

Signed-off-by: KUWAMURA Shin'ya <kuwa@xxxxxxxxxxxxxx>

diff -r 91407452cdb6 -r b040d2de8746 xen/common/grant_table.c
--- a/xen/common/grant_table.c  Wed Jul 15 13:15:50 2009 +0100
+++ b/xen/common/grant_table.c  Thu Jul 16 13:23:20 2009 +0900
@@ -227,6 +227,7 @@ __gnttab_map_grant_ref(
         return;
     }
 
+#ifndef __ia64__
     if ( unlikely(paging_mode_external(ld) &&
                   (op->flags & (GNTMAP_device_map|GNTMAP_application_map|
                             GNTMAP_contains_pte))) )
@@ -235,6 +236,7 @@ __gnttab_map_grant_ref(
         op->status = GNTST_general_error;
         return;
     }
+#endif
 
     if ( unlikely((rd = rcu_lock_domain_by_id(op->dom)) == NULL) )
     {
@@ -353,12 +355,14 @@ __gnttab_map_grant_ref(
         if ( mfn_valid(frame) )
             put_page(mfn_to_page(frame));
 
+#ifndef __ia64__
         if ( paging_mode_external(ld) )
         {
             gdprintk(XENLOG_WARNING, "HVM guests can't grant map iomem\n");
             rc = GNTST_general_error;
             goto undo_out;
         }
+#endif
 
         if ( !iomem_access_permitted(rd, frame, frame) )
         {

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