Re: [Xen-devel] [PATCH 06/12] PM: only include XEN_SYSCTL_{get_pmstat, pm_op} if HAVE_ACPI

[Keir Fraser <keir.xen@xxxxxxxxx>]

On 14/02/2012 14:43, "Ian Campbell" <ian.campbell@xxxxxxxxxx> wrote:

> These hypercalls are currently ACPI specific and implemented in
> xen/drivers/acpi which is not implemented on ARM.
> 
> Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>

Acked-by: Keir Fraser <keir@xxxxxxx>

> Cc: keir@xxxxxxx
> ---
>  xen/Rules.mk         |    1 +
>  xen/arch/arm/dummy.S |    2 --
>  xen/common/sysctl.c  |    2 ++
>  3 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/xen/Rules.mk b/xen/Rules.mk
> index 507e9ab..ee54179 100644
> --- a/xen/Rules.mk
> +++ b/xen/Rules.mk
> @@ -50,6 +50,7 @@ CFLAGS-$(crash_debug)   += -DCRASH_DEBUG
>  CFLAGS-$(perfc)         += -DPERF_COUNTERS
>  CFLAGS-$(perfc_arrays)  += -DPERF_ARRAYS
>  CFLAGS-$(lock_profile)  += -DLOCK_PROFILE
> +CFLAGS-$(HAS_ACPI)      += -DHAS_ACPI
>  CFLAGS-$(frame_pointer) += -fno-omit-frame-pointer -DCONFIG_FRAME_POINTER
>  
>  ifneq ($(max_phys_cpus),)
> diff --git a/xen/arch/arm/dummy.S b/xen/arch/arm/dummy.S
> index 1287e0b..3bf5226 100644
> --- a/xen/arch/arm/dummy.S
> +++ b/xen/arch/arm/dummy.S
> @@ -16,13 +16,11 @@ DUMMY(create_grant_host_mapping);
>  DUMMY(__cpu_die);
>  DUMMY(__cpu_disable);
>  DUMMY(__cpu_up);
> -DUMMY(do_get_pm_info);
>  DUMMY(domain_get_maximum_gpfn);
>  DUMMY(domain_relinquish_resources);
>  DUMMY(domain_set_time_offset);
>  DUMMY(dom_cow);
>  DUMMY(donate_page);
> -DUMMY(do_pm_op);
>  DUMMY(flush_tlb_mask);
>  DUMMY(free_vcpu_guest_context);
>  DUMMY(get_page);
> diff --git a/xen/common/sysctl.c b/xen/common/sysctl.c
> index f8f7cf8..fef0589 100644
> --- a/xen/common/sysctl.c
> +++ b/xen/common/sysctl.c
> @@ -224,6 +224,7 @@ long do_sysctl(XEN_GUEST_HANDLE(xen_sysctl_t) u_sysctl)
>      }
>      break;
>  
> +#ifdef HAS_ACPI
>      case XEN_SYSCTL_get_pmstat:
>      {
>          ret = xsm_get_pmstat();
> @@ -259,6 +260,7 @@ long do_sysctl(XEN_GUEST_HANDLE(xen_sysctl_t) u_sysctl)
>          }
>      }
>      break;
> +#endif
>  
>      case XEN_SYSCTL_page_offline_op:
>      {



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