On Wed, 11 Aug 2021, Wei Chen wrote: > Xen x86 has created a command line parameter "numa" as NUMA switch for > user to turn on/off NUMA. As device tree based NUMA has been enabled > for Arm, this parameter can be reused by Arm. So in this patch, we move > this parameter to common. > > Signed-off-by: Wei Chen <wei.c...@arm.com> > --- > xen/arch/x86/numa.c | 34 ---------------------------------- > xen/common/numa.c | 35 ++++++++++++++++++++++++++++++++++- > xen/include/xen/numa.h | 1 - > 3 files changed, 34 insertions(+), 36 deletions(-) > > diff --git a/xen/arch/x86/numa.c b/xen/arch/x86/numa.c > index 8b43be4aa7..380d8ed6fd 100644 > --- a/xen/arch/x86/numa.c > +++ b/xen/arch/x86/numa.c > @@ -11,7 +11,6 @@ > #include <xen/nodemask.h> > #include <xen/numa.h> > #include <xen/keyhandler.h> > -#include <xen/param.h> > #include <xen/time.h> > #include <xen/smp.h> > #include <xen/pfn.h> > @@ -19,9 +18,6 @@ > #include <xen/sched.h> > #include <xen/softirq.h> > > -static int numa_setup(const char *s); > -custom_param("numa", numa_setup); > - > #ifndef Dprintk > #define Dprintk(x...) > #endif > @@ -50,35 +46,6 @@ void numa_set_node(int cpu, nodeid_t node) > cpu_to_node[cpu] = node; > } > > -/* [numa=off] */ > -static __init int numa_setup(const char *opt) > -{ > - if ( !strncmp(opt,"off",3) ) > - numa_off = true; > - else if ( !strncmp(opt,"on",2) ) > - numa_off = false; > -#ifdef CONFIG_NUMA_EMU > - else if ( !strncmp(opt, "fake=", 5) ) > - { > - numa_off = false; > - numa_fake = simple_strtoul(opt+5,NULL,0); > - if ( numa_fake >= MAX_NUMNODES ) > - numa_fake = MAX_NUMNODES; > - } > -#endif > -#ifdef CONFIG_ACPI_NUMA > - else if ( !strncmp(opt,"noacpi",6) ) > - { > - numa_off = false; > - acpi_numa = -1; > - } > -#endif > - else > - return -EINVAL; > - > - return 0; > -} > - > /* > * Setup early cpu_to_node. > * > @@ -287,4 +254,3 @@ static __init int register_numa_trigger(void) > return 0; > } > __initcall(register_numa_trigger); > -
spurious change