ia64/xen-unstable

changeset 6800:6dadf4d93ee3

Converge ia64 grant_table API
author djm@kirby.fc.hp.com
date Tue Sep 13 14:20:02 2005 -0600 (2005-09-13)
parents 2c823d27cf33
children 52d2d5208575
files linux-2.6-xen-sparse/include/asm-xen/gnttab.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/include/asm-xen/gnttab.h	Tue Sep 13 13:42:33 2005 -0600
     1.2 +++ b/linux-2.6-xen-sparse/include/asm-xen/gnttab.h	Tue Sep 13 14:20:02 2005 -0600
     1.3 @@ -18,7 +18,11 @@
     1.4  #include <asm-xen/xen-public/grant_table.h>
     1.5  
     1.6  /* NR_GRANT_FRAMES must be less than or equal to that configured in Xen */
     1.7 +#ifdef __ia64__
     1.8 +#define NR_GRANT_FRAMES 1
     1.9 +#else
    1.10  #define NR_GRANT_FRAMES 4
    1.11 +#endif
    1.12  
    1.13  struct gnttab_free_callback {
    1.14      struct gnttab_free_callback *next;
    1.15 @@ -63,4 +67,10 @@ void gnttab_grant_foreign_access_ref(gra
    1.16  void gnttab_grant_foreign_transfer_ref(grant_ref_t, domid_t domid,
    1.17  				       unsigned long pfn);
    1.18  
    1.19 +#ifdef __ia64__
    1.20 +#define gnttab_map_vaddr(map) __va(map.dev_bus_addr)
    1.21 +#else
    1.22 +#define gnttab_map_vaddr(map) ((void *)(map.host_virt_addr))
    1.23 +#endif
    1.24 +
    1.25  #endif /* __ASM_GNTTAB_H__ */