On 26.03.2025 06:50, Penny Zheng wrote:
> --- a/xen/common/Makefile
> +++ b/xen/common/Makefile
> @@ -69,7 +69,7 @@ obj-$(CONFIG_COMPAT) += $(addprefix compat/,domain.o 
> memory.o multicall.o xlat.o
>  ifneq ($(CONFIG_PV_SHIM_EXCLUSIVE),y)
>  obj-y += domctl.o
>  obj-$(CONFIG_VM_EVENT) += monitor.o
> -obj-y += sysctl.o
> +obj-$(CONFIG_SYSCTL) += sysctl.o
>  endif

Same as for the respective x86 change: Imo this needs to move out of the
conditional again, back into the normal list of objects.

> --- a/xen/include/hypercall-defs.c
> +++ b/xen/include/hypercall-defs.c
> @@ -195,10 +195,12 @@ kexec_op(unsigned long op, void *uarg)
>  dm_op(domid_t domid, unsigned int nr_bufs, xen_dm_op_buf_t *bufs)
>  #endif
>  #ifndef CONFIG_PV_SHIM_EXCLUSIVE
> -sysctl(xen_sysctl_t *u_sysctl)
>  domctl(xen_domctl_t *u_domctl)
>  paging_domctl_cont(xen_domctl_t *u_domctl)
>  platform_op(xen_platform_op_t *u_xenpf_op)
> +#ifdef CONFIG_SYSCTL
> +sysctl(xen_sysctl_t *u_sysctl)
> +#endif
>  #endif

If you don't move this out of the enclosing #ifdef, I don't see why you move
it at all.

> @@ -274,8 +276,10 @@ physdev_op                         compat   do       hvm 
>      hvm      do_arm
>  hvm_op                             do       do       do       do       do
>  #endif
>  #ifndef CONFIG_PV_SHIM_EXCLUSIVE
> -sysctl                             do       do       do       do       do
>  domctl                             do       do       do       do       do
> +#ifdef CONFIG_SYSCTL
> +sysctl                             do       do       do       do       do
> +#endif
>  #endif

Same here.

Jan

Reply via email to