| Message ID | 20210923120236.3692135-18-wei.chen@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add device tree based NUMA support to Arm | expand |
+x86 maintainers On Thu, 23 Sep 2021, Wei Chen wrote: > As we have turned numa_scan_nodes to neutral function. If we > still use CONFIG_ACPI_NUMA in numa_initmem_init to gate > numa_scan_nodes that doesn't make sense. As CONFIG_ACPI_NUMA > will be selected by CONFIG_NUMA for x86. So in this patch, > we replace CONFIG_ACPI_NUMA by CONFIG_NUMA. > > Signed-off-by: Wei Chen <wei.chen@arm.com> > --- > xen/arch/x86/numa.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/xen/arch/x86/numa.c b/xen/arch/x86/numa.c > index 8a4710df39..509d2738c0 100644 > --- a/xen/arch/x86/numa.c > +++ b/xen/arch/x86/numa.c > @@ -260,7 +260,7 @@ void __init numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn) > start = pfn_to_paddr(start_pfn); > end = pfn_to_paddr(end_pfn); > > -#ifdef CONFIG_ACPI_NUMA > +#ifdef CONFIG_NUMA > if ( !numa_off && !numa_scan_nodes(start, end) ) > return; > #endif > -- > 2.25.1 >
On 23.09.2021 14:02, Wei Chen wrote: > As we have turned numa_scan_nodes to neutral function. If we > still use CONFIG_ACPI_NUMA in numa_initmem_init to gate > numa_scan_nodes that doesn't make sense. As CONFIG_ACPI_NUMA > will be selected by CONFIG_NUMA for x86. So in this patch, > we replace CONFIG_ACPI_NUMA by CONFIG_NUMA. > > Signed-off-by: Wei Chen <wei.chen@arm.com> > --- > xen/arch/x86/numa.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/xen/arch/x86/numa.c b/xen/arch/x86/numa.c > index 8a4710df39..509d2738c0 100644 > --- a/xen/arch/x86/numa.c > +++ b/xen/arch/x86/numa.c > @@ -260,7 +260,7 @@ void __init numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn) > start = pfn_to_paddr(start_pfn); > end = pfn_to_paddr(end_pfn); > > -#ifdef CONFIG_ACPI_NUMA > +#ifdef CONFIG_NUMA > if ( !numa_off && !numa_scan_nodes(start, end) ) > return; > #endif Why is this a separate patch, rather than part of the one renaming the function? Jan
Hi Jan, > -----Original Message----- > From: Jan Beulich <jbeulich@suse.com> > Sent: 2022年1月25日 18:26 > To: Wei Chen <Wei.Chen@arm.com> > Cc: Bertrand Marquis <Bertrand.Marquis@arm.com>; xen- > devel@lists.xenproject.org; sstabellini@kernel.org; julien@xen.org > Subject: Re: [PATCH 17/37] xen/x86: use CONFIG_NUMA to gate > numa_scan_nodes > > On 23.09.2021 14:02, Wei Chen wrote: > > As we have turned numa_scan_nodes to neutral function. If we > > still use CONFIG_ACPI_NUMA in numa_initmem_init to gate > > numa_scan_nodes that doesn't make sense. As CONFIG_ACPI_NUMA > > will be selected by CONFIG_NUMA for x86. So in this patch, > > we replace CONFIG_ACPI_NUMA by CONFIG_NUMA. > > > > Signed-off-by: Wei Chen <wei.chen@arm.com> > > --- > > xen/arch/x86/numa.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/xen/arch/x86/numa.c b/xen/arch/x86/numa.c > > index 8a4710df39..509d2738c0 100644 > > --- a/xen/arch/x86/numa.c > > +++ b/xen/arch/x86/numa.c > > @@ -260,7 +260,7 @@ void __init numa_initmem_init(unsigned long > start_pfn, unsigned long end_pfn) > > start = pfn_to_paddr(start_pfn); > > end = pfn_to_paddr(end_pfn); > > > > -#ifdef CONFIG_ACPI_NUMA > > +#ifdef CONFIG_NUMA > > if ( !numa_off && !numa_scan_nodes(start, end) ) > > return; > > #endif > > Why is this a separate patch, rather than part of the one renaming > the function? I will merge these two patches. > > Jan
diff --git a/xen/arch/x86/numa.c b/xen/arch/x86/numa.c index 8a4710df39..509d2738c0 100644 --- a/xen/arch/x86/numa.c +++ b/xen/arch/x86/numa.c @@ -260,7 +260,7 @@ void __init numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn) start = pfn_to_paddr(start_pfn); end = pfn_to_paddr(end_pfn); -#ifdef CONFIG_ACPI_NUMA +#ifdef CONFIG_NUMA if ( !numa_off && !numa_scan_nodes(start, end) ) return; #endif
As we have turned numa_scan_nodes to neutral function. If we still use CONFIG_ACPI_NUMA in numa_initmem_init to gate numa_scan_nodes that doesn't make sense. As CONFIG_ACPI_NUMA will be selected by CONFIG_NUMA for x86. So in this patch, we replace CONFIG_ACPI_NUMA by CONFIG_NUMA. Signed-off-by: Wei Chen <wei.chen@arm.com> --- xen/arch/x86/numa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)