ia64/xen-unstable

changeset 14952:f8fd9afd2aad

acm: Fix 32-bit build with acm enabled.
Signed-off-by: Stefan Berger <stefanb@us.ibm.com>
author kfraser@localhost.localdomain
date Thu Apr 26 15:25:09 2007 +0100 (2007-04-26)
parents 816d274e2a85
children d0acb5a3e8d8
files xen/acm/acm_policy.c xen/include/acm/acm_core.h
line diff
     1.1 --- a/xen/acm/acm_policy.c	Thu Apr 26 11:29:41 2007 +0100
     1.2 +++ b/xen/acm/acm_policy.c	Thu Apr 26 15:25:09 2007 +0100
     1.3 @@ -46,7 +46,7 @@ static ssidref_t oldssid_to_newssid(cons
     1.4  
     1.5  
     1.6  int
     1.7 -acm_set_policy(XEN_GUEST_HANDLE(void) buf, u32 buf_size)
     1.8 +acm_set_policy(XEN_GUEST_HANDLE_64(void) buf, u32 buf_size)
     1.9  {
    1.10      u8 *policy_buffer = NULL;
    1.11      int ret = -EFAULT;
    1.12 @@ -213,7 +213,7 @@ do_acm_set_policy(void *buf, u32 buf_siz
    1.13  }
    1.14  
    1.15  int
    1.16 -acm_get_policy(XEN_GUEST_HANDLE(void) buf, u32 buf_size)
    1.17 +acm_get_policy(XEN_GUEST_HANDLE_64(void) buf, u32 buf_size)
    1.18  { 
    1.19      u8 *policy_buffer;
    1.20      int ret;
    1.21 @@ -278,7 +278,7 @@ acm_get_policy(XEN_GUEST_HANDLE(void) bu
    1.22  }
    1.23  
    1.24  int
    1.25 -acm_dump_statistics(XEN_GUEST_HANDLE(void) buf, u16 buf_size)
    1.26 +acm_dump_statistics(XEN_GUEST_HANDLE_64(void) buf, u16 buf_size)
    1.27  { 
    1.28      /* send stats to user space */
    1.29      u8 *stats_buffer;
    1.30 @@ -324,7 +324,7 @@ acm_dump_statistics(XEN_GUEST_HANDLE(voi
    1.31  
    1.32  
    1.33  int
    1.34 -acm_get_ssid(ssidref_t ssidref, XEN_GUEST_HANDLE(void) buf, u16 buf_size)
    1.35 +acm_get_ssid(ssidref_t ssidref, XEN_GUEST_HANDLE_64(void) buf, u16 buf_size)
    1.36  {
    1.37      /* send stats to user space */
    1.38      u8 *ssid_buffer;
     2.1 --- a/xen/include/acm/acm_core.h	Thu Apr 26 11:29:41 2007 +0100
     2.2 +++ b/xen/include/acm/acm_core.h	Thu Apr 26 15:25:09 2007 +0100
     2.3 @@ -155,13 +155,13 @@ int acm_init_domain_ssid(domid_t id, ssi
     2.4  int acm_init_domain_ssid_new(struct domain *, ssidref_t ssidref);
     2.5  void acm_free_domain_ssid(struct acm_ssid_domain *ssid);
     2.6  int acm_init_binary_policy(u32 policy_code);
     2.7 -int acm_set_policy(XEN_GUEST_HANDLE(void) buf, u32 buf_size);
     2.8 +int acm_set_policy(XEN_GUEST_HANDLE_64(void) buf, u32 buf_size);
     2.9  int do_acm_set_policy(void *buf, u32 buf_size, int is_bootpolicy,
    2.10                        struct acm_sized_buffer *, struct acm_sized_buffer *,
    2.11                        struct acm_sized_buffer *);
    2.12 -int acm_get_policy(XEN_GUEST_HANDLE(void) buf, u32 buf_size);
    2.13 -int acm_dump_statistics(XEN_GUEST_HANDLE(void) buf, u16 buf_size);
    2.14 -int acm_get_ssid(ssidref_t ssidref, XEN_GUEST_HANDLE(void) buf, u16 buf_size);
    2.15 +int acm_get_policy(XEN_GUEST_HANDLE_64(void) buf, u32 buf_size);
    2.16 +int acm_dump_statistics(XEN_GUEST_HANDLE_64(void) buf, u16 buf_size);
    2.17 +int acm_get_ssid(ssidref_t ssidref, XEN_GUEST_HANDLE_64(void) buf, u16 buf_size);
    2.18  int acm_get_decision(ssidref_t ssidref1, ssidref_t ssidref2, u32 hook);
    2.19  int acm_set_policy_reference(u8 * buf, u32 buf_size);
    2.20  int acm_dump_policy_reference(u8 *buf, u32 buf_size);