diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2013-05-07 21:51:58 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2013-05-07 21:51:58 -0400 |
commit | fc0460d0dfb19d4887f509a2573197ca0f417ce9 (patch) | |
tree | 8010389ce90dd6052f5950019128690d012051cf /arch/mips/sgi-ip27 | |
parent | f6161aa153581da4a3867a2d1a7caf4be19b6ec9 (diff) |
MIPS: IP27: Remove pfn_t.
In the Linux kernel traditionally pfns are represented by an unsigned long.
However a few bits of the SGI IP27 platform code that were ported from
IRIX are using pfn_t for historic reasons. This is conflicting with
KVM's use of pfn_t.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/sgi-ip27')
-rw-r--r-- | arch/mips/sgi-ip27/ip27-klnuma.c | 2 | ||||
-rw-r--r-- | arch/mips/sgi-ip27/ip27-memory.c | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/arch/mips/sgi-ip27/ip27-klnuma.c b/arch/mips/sgi-ip27/ip27-klnuma.c index 1d1919a44e88..7a53b1e28a93 100644 --- a/arch/mips/sgi-ip27/ip27-klnuma.c +++ b/arch/mips/sgi-ip27/ip27-klnuma.c | |||
@@ -114,7 +114,7 @@ void __init replicate_kernel_text() | |||
114 | * data structures on the first couple of pages of the first slot of each | 114 | * data structures on the first couple of pages of the first slot of each |
115 | * node. If this is the case, getfirstfree(node) > getslotstart(node, 0). | 115 | * node. If this is the case, getfirstfree(node) > getslotstart(node, 0). |
116 | */ | 116 | */ |
117 | pfn_t node_getfirstfree(cnodeid_t cnode) | 117 | unsigned long node_getfirstfree(cnodeid_t cnode) |
118 | { | 118 | { |
119 | unsigned long loadbase = REP_BASE; | 119 | unsigned long loadbase = REP_BASE; |
120 | nasid_t nasid = COMPACT_TO_NASID_NODEID(cnode); | 120 | nasid_t nasid = COMPACT_TO_NASID_NODEID(cnode); |
diff --git a/arch/mips/sgi-ip27/ip27-memory.c b/arch/mips/sgi-ip27/ip27-memory.c index 3505d08ff2fd..64d8dab06b01 100644 --- a/arch/mips/sgi-ip27/ip27-memory.c +++ b/arch/mips/sgi-ip27/ip27-memory.c | |||
@@ -255,14 +255,14 @@ static void __init dump_topology(void) | |||
255 | } | 255 | } |
256 | } | 256 | } |
257 | 257 | ||
258 | static pfn_t __init slot_getbasepfn(cnodeid_t cnode, int slot) | 258 | static unsigned long __init slot_getbasepfn(cnodeid_t cnode, int slot) |
259 | { | 259 | { |
260 | nasid_t nasid = COMPACT_TO_NASID_NODEID(cnode); | 260 | nasid_t nasid = COMPACT_TO_NASID_NODEID(cnode); |
261 | 261 | ||
262 | return ((pfn_t)nasid << PFN_NASIDSHFT) | (slot << SLOT_PFNSHIFT); | 262 | return ((unsigned long)nasid << PFN_NASIDSHFT) | (slot << SLOT_PFNSHIFT); |
263 | } | 263 | } |
264 | 264 | ||
265 | static pfn_t __init slot_psize_compute(cnodeid_t node, int slot) | 265 | static unsigned long __init slot_psize_compute(cnodeid_t node, int slot) |
266 | { | 266 | { |
267 | nasid_t nasid; | 267 | nasid_t nasid; |
268 | lboard_t *brd; | 268 | lboard_t *brd; |
@@ -353,7 +353,7 @@ static void __init mlreset(void) | |||
353 | 353 | ||
354 | static void __init szmem(void) | 354 | static void __init szmem(void) |
355 | { | 355 | { |
356 | pfn_t slot_psize, slot0sz = 0, nodebytes; /* Hack to detect problem configs */ | 356 | unsigned long slot_psize, slot0sz = 0, nodebytes; /* Hack to detect problem configs */ |
357 | int slot; | 357 | int slot; |
358 | cnodeid_t node; | 358 | cnodeid_t node; |
359 | 359 | ||
@@ -390,10 +390,10 @@ static void __init szmem(void) | |||
390 | 390 | ||
391 | static void __init node_mem_init(cnodeid_t node) | 391 | static void __init node_mem_init(cnodeid_t node) |
392 | { | 392 | { |
393 | pfn_t slot_firstpfn = slot_getbasepfn(node, 0); | 393 | unsigned long slot_firstpfn = slot_getbasepfn(node, 0); |
394 | pfn_t slot_freepfn = node_getfirstfree(node); | 394 | unsigned long slot_freepfn = node_getfirstfree(node); |
395 | unsigned long bootmap_size; | 395 | unsigned long bootmap_size; |
396 | pfn_t start_pfn, end_pfn; | 396 | unsigned long start_pfn, end_pfn; |
397 | 397 | ||
398 | get_pfn_range_for_nid(node, &start_pfn, &end_pfn); | 398 | get_pfn_range_for_nid(node, &start_pfn, &end_pfn); |
399 | 399 | ||
@@ -467,7 +467,7 @@ void __init paging_init(void) | |||
467 | pagetable_init(); | 467 | pagetable_init(); |
468 | 468 | ||
469 | for_each_online_node(node) { | 469 | for_each_online_node(node) { |
470 | pfn_t start_pfn, end_pfn; | 470 | unsigned long start_pfn, end_pfn; |
471 | 471 | ||
472 | get_pfn_range_for_nid(node, &start_pfn, &end_pfn); | 472 | get_pfn_range_for_nid(node, &start_pfn, &end_pfn); |
473 | 473 | ||