Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit abe059e7 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

[PATCH] x86_64: Rename struct node in x86-64 NUMA code to struct bootnode 



It conflicts with the struct node in node.h
Actually the x86-64 version was there first, but ..

Suggested by Jan Beulich

Cc: jbeulich@novell.com
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 913bd906

arch/x86_64/mm/k8topology.c

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ static __init int find_northbridge(void) 
int __init k8_scan_nodes(unsigned long start, unsigned long end)

{ 

	unsigned long prevbase;

	struct node nodes[8];

	struct bootnode nodes[8];

	int nodeid, i, nb; 

	unsigned char nodeids[8];

	int found = 0;

arch/x86_64/mm/numa.c

+3 −3
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ int numa_off __initdata; 
 * -1 if node overlap or lost ram (shift too big)

 */

static int __init

populate_memnodemap(const struct node *nodes, int numnodes, int shift)

populate_memnodemap(const struct bootnode *nodes, int numnodes, int shift)

{

	int i; 

	int res = -1;
@@ -74,7 +74,7 @@ populate_memnodemap(const struct node *nodes, int numnodes, int shift) 
	return res;

}



int __init compute_hash_shift(struct node *nodes, int numnodes)

int __init compute_hash_shift(struct bootnode *nodes, int numnodes)

{

	int shift = 20;
@@ -191,7 +191,7 @@ int numa_fake __initdata = 0; 
static int numa_emulation(unsigned long start_pfn, unsigned long end_pfn)

{

 	int i;

 	struct node nodes[MAX_NUMNODES];

 	struct bootnode nodes[MAX_NUMNODES];

 	unsigned long sz = ((end_pfn - start_pfn)<<PAGE_SHIFT) / numa_fake;



 	/* Kludge needed for the hash function */

arch/x86_64/mm/srat.c

+4 −4
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ static struct acpi_table_slit *acpi_slit; 


static nodemask_t nodes_parsed __initdata;

static nodemask_t nodes_found __initdata;

static struct node nodes[MAX_NUMNODES] __initdata;

static struct bootnode nodes[MAX_NUMNODES] __initdata;

static u8 pxm2node[256] = { [0 ... 255] = 0xff };



/* Too small nodes confuse the VM badly. Usually they result
@@ -57,7 +57,7 @@ static __init int conflicting_nodes(unsigned long start, unsigned long end) 
{

	int i;

	for_each_node_mask(i, nodes_parsed) {

		struct node *nd = &nodes[i];

		struct bootnode *nd = &nodes[i];

		if (nd->start == nd->end)

			continue;

		if (nd->end > start && nd->start < end)
@@ -70,7 +70,7 @@ static __init int conflicting_nodes(unsigned long start, unsigned long end) 


static __init void cutoff_node(int i, unsigned long start, unsigned long end)

{

	struct node *nd = &nodes[i];

	struct bootnode *nd = &nodes[i];

	if (nd->start < start) {

		nd->start = start;

		if (nd->end < nd->start)
@@ -159,7 +159,7 @@ acpi_numa_processor_affinity_init(struct acpi_table_processor_affinity *pa) 
void __init

acpi_numa_memory_affinity_init(struct acpi_table_memory_affinity *ma)

{

	struct node *nd;

	struct bootnode *nd;

	unsigned long start, end;

	int node, pxm;

	int i;

include/asm-x86_64/numa.h

+2 −2
Original line number Diff line number Diff line
@@ -4,11 +4,11 @@ 
#include <linux/nodemask.h>

#include <asm/numnodes.h>



struct node { 

struct bootnode {

	u64 start,end; 

};



extern int compute_hash_shift(struct node *nodes, int numnodes);

extern int compute_hash_shift(struct bootnode *nodes, int numnodes);

extern int pxm_to_node(int nid);



#define ZONE_ALIGN (1UL << (MAX_ORDER+PAGE_SHIFT))