diff options
| author | Jan Beulich <jbeulich@suse.com> | 2012-03-08 13:49:24 +0100 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2012-03-08 13:49:24 +0100 |
| commit | 48844dc21098fa59f1cac06eba31b548f576a446 (patch) | |
| tree | 411b8116d6382cb121a8cb79faae553b2cd71b21 /xen | |
| parent | 5e65338b200eb3f92943208952ffaba349513a4d (diff) | |
| download | xen-48844dc21098fa59f1cac06eba31b548f576a446.tar.gz xen-48844dc21098fa59f1cac06eba31b548f576a446.tar.bz2 xen-48844dc21098fa59f1cac06eba31b548f576a446.zip | |
ia64: fix build (once more)
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Diffstat (limited to 'xen')
| -rw-r--r-- | xen/arch/ia64/xen/dom0_ops.c | 2 | ||||
| -rw-r--r-- | xen/common/tmem_xen.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/xen/arch/ia64/xen/dom0_ops.c b/xen/arch/ia64/xen/dom0_ops.c index a372d58221..57a1905f32 100644 --- a/xen/arch/ia64/xen/dom0_ops.c +++ b/xen/arch/ia64/xen/dom0_ops.c @@ -558,7 +558,7 @@ long arch_do_domctl(xen_domctl_t *op, XEN_GUEST_HANDLE(xen_domctl_t) u_domctl) switch(mec->op) { - case XEN_DOMCTL_MEM_EVENT_OP_SHARING_CONTROL: + case XEN_DOMCTL_MEM_SHARING_CONTROL: { if (mec->u.enable) { ret = -EINVAL; /* not implemented */ diff --git a/xen/common/tmem_xen.c b/xen/common/tmem_xen.c index 9b2a22cb76..37e82896f5 100644 --- a/xen/common/tmem_xen.c +++ b/xen/common/tmem_xen.c @@ -13,7 +13,6 @@ #include <xen/domain_page.h> #include <xen/cpu.h> #include <xen/init.h> -#include <asm/p2m.h> #define EXPORT /* indicates code other modules are dependent upon */ @@ -103,6 +102,8 @@ static inline void cli_put_page(tmem_cli_mfn_t cmfn, void *cli_va, pfp_t *cli_pf ASSERT(0); } #else +#include <asm/p2m.h> + static inline void *cli_get_page(tmem_cli_mfn_t cmfn, unsigned long *pcli_mfn, pfp_t **pcli_pfp, bool_t cli_write) { |