[PATCH] x86, numa: move bootnode definition into srat_64.c

[PATCH] x86, numa: move bootnode definition into srat_64.c

[Yinghai Lu]

only one user there for hot memory add.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>

diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h
index 12e0e7d..416d865 100644
--- a/arch/x86/include/asm/acpi.h
+++ b/arch/x86/include/asm/acpi.h
@@ -183,8 +183,6 @@ static inline void disable_acpi(void) { }
 
 #define ARCH_HAS_POWER_INIT	1
 
-struct bootnode;
-
 #ifdef CONFIG_ACPI_NUMA
 extern int acpi_numa;
 extern int x86_acpi_numa_init(void);
diff --git a/arch/x86/include/asm/amd_nb.h b/arch/x86/include/asm/amd_nb.h
index e264ae5..1263bf4 100644
--- a/arch/x86/include/asm/amd_nb.h
+++ b/arch/x86/include/asm/amd_nb.h
@@ -11,7 +11,6 @@ struct amd_nb_bus_dev_range {
 
 extern const struct pci_device_id amd_nb_misc_ids[];
 extern const struct amd_nb_bus_dev_range amd_nb_bus_dev_ranges[];
-struct bootnode;
 
 extern int early_is_amd_nb(u32 value);
 extern int amd_cache_northbridges(void);
diff --git a/arch/x86/include/asm/numa_64.h b/arch/x86/include/asm/numa_64.h
index 344eb17..52f9b12 100644
--- a/arch/x86/include/asm/numa_64.h
+++ b/arch/x86/include/asm/numa_64.h
@@ -3,11 +3,6 @@
 
 #include <linux/nodemask.h>
 
-struct bootnode {
-	u64 start;
-	u64 end;
-};
-
 #define ZONE_ALIGN (1UL << (MAX_ORDER+PAGE_SHIFT))
 
 extern int numa_off;
diff --git a/arch/x86/mm/srat_64.c b/arch/x86/mm/srat_64.c
index 8e9d339..7e5d0e9 100644
--- a/arch/x86/mm/srat_64.c
+++ b/arch/x86/mm/srat_64.c
@@ -26,6 +26,11 @@
 
 int acpi_numa __initdata;
 
+struct bootnode {
+	u64 start;
+	u64 end;
+};
+
 static struct bootnode nodes_add[MAX_NUMNODES];
 
 static __init int setup_node(int pxm)

Re: [PATCH] x86, numa: move bootnode definition into srat_64.c

[Tejun Heo]

On Wed, Mar 02, 2011 at 05:20:40PM -0800, Yinghai Lu wrote:
> only one user there for hot memory add.

Again, please use proper sentences.

 Only srat_64 hot memory add code uses struct bootnode.  Move its
 definition into srat_64.c

Thanks.

-- 
tejun

Re: [PATCH] x86, numa: move bootnode definition into srat_64.c

[David Rientjes]

On Wed, 2 Mar 2011, Yinghai Lu wrote:

> diff --git a/arch/x86/mm/srat_64.c b/arch/x86/mm/srat_64.c
> index 8e9d339..7e5d0e9 100644
> --- a/arch/x86/mm/srat_64.c
> +++ b/arch/x86/mm/srat_64.c
> @@ -26,6 +26,11 @@
>  
>  int acpi_numa __initdata;
>  
> +struct bootnode {
> +	u64 start;
> +	u64 end;
> +};
> +
>  static struct bootnode nodes_add[MAX_NUMNODES];
>  
>  static __init int setup_node(int pxm)

Can we get rid of struct bootnode instead and simply reuse 
struct numa_memblk?  The latter isn't actually tied to memblock and is a 
generic representation of a node id and address range.

Re: [PATCH] x86, numa: move bootnode definition into srat_64.c

[Yinghai Lu]

On 03/03/2011 12:52 PM, David Rientjes wrote:
> On Wed, 2 Mar 2011, Yinghai Lu wrote:
> 
>> diff --git a/arch/x86/mm/srat_64.c b/arch/x86/mm/srat_64.c
>> index 8e9d339..7e5d0e9 100644
>> --- a/arch/x86/mm/srat_64.c
>> +++ b/arch/x86/mm/srat_64.c
>> @@ -26,6 +26,11 @@
>>  
>>  int acpi_numa __initdata;
>>  
>> +struct bootnode {
>> +	u64 start;
>> +	u64 end;
>> +};
>> +
>>  static struct bootnode nodes_add[MAX_NUMNODES];
>>  
>>  static __init int setup_node(int pxm)
> 
> Can we get rid of struct bootnode instead and simply reuse 
> struct numa_memblk?  The latter isn't actually tied to memblock and is a 
> generic representation of a node id and address range.

Yes, could be don later esp if the hotplug mem code would support 
more than one block add per node.

Yinghai