diff options
Diffstat (limited to 'arch/mips/sgi-ip27')
-rw-r--r-- | arch/mips/sgi-ip27/ip27-klnuma.c | 5 | ||||
-rw-r--r-- | arch/mips/sgi-ip27/ip27-memory.c | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/arch/mips/sgi-ip27/ip27-klnuma.c b/arch/mips/sgi-ip27/ip27-klnuma.c index 7a53b1e28a93..ecbb62f339c5 100644 --- a/arch/mips/sgi-ip27/ip27-klnuma.c +++ b/arch/mips/sgi-ip27/ip27-klnuma.c | |||
@@ -125,8 +125,7 @@ unsigned long node_getfirstfree(cnodeid_t cnode) | |||
125 | #endif | 125 | #endif |
126 | offset = PAGE_ALIGN((unsigned long)(&_end)) - loadbase; | 126 | offset = PAGE_ALIGN((unsigned long)(&_end)) - loadbase; |
127 | if ((cnode == 0) || (cpu_isset(cnode, ktext_repmask))) | 127 | if ((cnode == 0) || (cpu_isset(cnode, ktext_repmask))) |
128 | return (TO_NODE(nasid, offset) >> PAGE_SHIFT); | 128 | return TO_NODE(nasid, offset) >> PAGE_SHIFT; |
129 | else | 129 | else |
130 | return (KDM_TO_PHYS(PAGE_ALIGN(SYMMON_STK_ADDR(nasid, 0))) >> | 130 | return KDM_TO_PHYS(PAGE_ALIGN(SYMMON_STK_ADDR(nasid, 0))) >> PAGE_SHIFT; |
131 | PAGE_SHIFT); | ||
132 | } | 131 | } |
diff --git a/arch/mips/sgi-ip27/ip27-memory.c b/arch/mips/sgi-ip27/ip27-memory.c index a304bcc37e4f..0b68469e063f 100644 --- a/arch/mips/sgi-ip27/ip27-memory.c +++ b/arch/mips/sgi-ip27/ip27-memory.c | |||
@@ -42,8 +42,7 @@ static int fine_mode; | |||
42 | 42 | ||
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) >> NSRI_REGIONSIZE_SHFT) & REGIONSIZE_FINE; |
46 | >> NSRI_REGIONSIZE_SHFT) & REGIONSIZE_FINE); | ||
47 | } | 46 | } |
48 | 47 | ||
49 | static hubreg_t get_region(cnodeid_t cnode) | 48 | static hubreg_t get_region(cnodeid_t cnode) |
@@ -288,7 +287,7 @@ static unsigned long __init slot_psize_compute(cnodeid_t node, int slot) | |||
288 | if (size <= 128) { | 287 | if (size <= 128) { |
289 | if (slot % 4 == 0) { | 288 | if (slot % 4 == 0) { |
290 | size <<= 20; /* size in bytes */ | 289 | size <<= 20; /* size in bytes */ |
291 | return(size >> PAGE_SHIFT); | 290 | return size >> PAGE_SHIFT; |
292 | } else | 291 | } else |
293 | return 0; | 292 | return 0; |
294 | } else { | 293 | } else { |