diff options
Diffstat (limited to 'arch/mips/sgi-ip27/ip27-memory.c')
-rw-r--r-- | arch/mips/sgi-ip27/ip27-memory.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/mips/sgi-ip27/ip27-memory.c b/arch/mips/sgi-ip27/ip27-memory.c index cd8fcab6b054..3505d08ff2fd 100644 --- a/arch/mips/sgi-ip27/ip27-memory.c +++ b/arch/mips/sgi-ip27/ip27-memory.c | |||
@@ -31,8 +31,8 @@ | |||
31 | #include <asm/sn/sn_private.h> | 31 | #include <asm/sn/sn_private.h> |
32 | 32 | ||
33 | 33 | ||
34 | #define SLOT_PFNSHIFT (SLOT_SHIFT - PAGE_SHIFT) | 34 | #define SLOT_PFNSHIFT (SLOT_SHIFT - PAGE_SHIFT) |
35 | #define PFN_NASIDSHFT (NASID_SHFT - PAGE_SHIFT) | 35 | #define PFN_NASIDSHFT (NASID_SHFT - PAGE_SHIFT) |
36 | 36 | ||
37 | struct node_data *__node_data[MAX_COMPACT_NODES]; | 37 | struct node_data *__node_data[MAX_COMPACT_NODES]; |
38 | 38 | ||
@@ -43,7 +43,7 @@ static int fine_mode; | |||
43 | static int is_fine_dirmode(void) | 43 | static int is_fine_dirmode(void) |
44 | { | 44 | { |
45 | return (((LOCAL_HUB_L(NI_STATUS_REV_ID) & NSRI_REGIONSIZE_MASK) | 45 | return (((LOCAL_HUB_L(NI_STATUS_REV_ID) & NSRI_REGIONSIZE_MASK) |
46 | >> NSRI_REGIONSIZE_SHFT) & REGIONSIZE_FINE); | 46 | >> NSRI_REGIONSIZE_SHFT) & REGIONSIZE_FINE); |
47 | } | 47 | } |
48 | 48 | ||
49 | static hubreg_t get_region(cnodeid_t cnode) | 49 | static hubreg_t get_region(cnodeid_t cnode) |
@@ -66,7 +66,7 @@ static void gen_region_mask(hubreg_t *region_mask) | |||
66 | } | 66 | } |
67 | } | 67 | } |
68 | 68 | ||
69 | #define rou_rflag rou_flags | 69 | #define rou_rflag rou_flags |
70 | 70 | ||
71 | static int router_distance; | 71 | static int router_distance; |
72 | 72 | ||
@@ -412,7 +412,7 @@ static void __init node_mem_init(cnodeid_t node) | |||
412 | slot_freepfn += PFN_UP(sizeof(struct pglist_data) + | 412 | slot_freepfn += PFN_UP(sizeof(struct pglist_data) + |
413 | sizeof(struct hub_data)); | 413 | sizeof(struct hub_data)); |
414 | 414 | ||
415 | bootmap_size = init_bootmem_node(NODE_DATA(node), slot_freepfn, | 415 | bootmap_size = init_bootmem_node(NODE_DATA(node), slot_freepfn, |
416 | start_pfn, end_pfn); | 416 | start_pfn, end_pfn); |
417 | free_bootmem_with_active_regions(node, end_pfn); | 417 | free_bootmem_with_active_regions(node, end_pfn); |
418 | reserve_bootmem_node(NODE_DATA(node), slot_firstpfn << PAGE_SHIFT, | 418 | reserve_bootmem_node(NODE_DATA(node), slot_firstpfn << PAGE_SHIFT, |
@@ -422,7 +422,7 @@ static void __init node_mem_init(cnodeid_t node) | |||
422 | } | 422 | } |
423 | 423 | ||
424 | /* | 424 | /* |
425 | * A node with nothing. We use it to avoid any special casing in | 425 | * A node with nothing. We use it to avoid any special casing in |
426 | * cpumask_of_node | 426 | * cpumask_of_node |
427 | */ | 427 | */ |
428 | static struct node_data null_node = { | 428 | static struct node_data null_node = { |