Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+10 -11
+1 -1
arch/mips/include/asm/sn/sn_private.h
··· 14 14 extern void install_ipi(void); 15 15 extern void setup_replication_mask(void); 16 16 extern void replicate_kernel_text(void); 17 - extern pfn_t node_getfirstfree(cnodeid_t); 17 + extern unsigned long node_getfirstfree(cnodeid_t); 18 18 19 19 #endif /* __ASM_SN_SN_PRIVATE_H */
-1
arch/mips/include/asm/sn/types.h
··· 19 19 typedef signed short moduleid_t; /* user-visible module number type */ 20 20 typedef signed short cmoduleid_t; /* kernel compact module id type */ 21 21 typedef unsigned char clusterid_t; /* Clusterid of the cell */ 22 - typedef unsigned long pfn_t; 23 22 24 23 typedef dev_t vertex_hdl_t; /* hardware graph vertex handle */ 25 24
+1 -1
arch/mips/sgi-ip27/ip27-klnuma.c
··· 114 114 * data structures on the first couple of pages of the first slot of each 115 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 119 unsigned long loadbase = REP_BASE; 120 120 nasid_t nasid = COMPACT_TO_NASID_NODEID(cnode);
+8 -8
arch/mips/sgi-ip27/ip27-memory.c
··· 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 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 267 nasid_t nasid; 268 268 lboard_t *brd; ··· 353 353 354 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 357 int slot; 358 358 cnodeid_t node; 359 359 ··· 390 390 391 391 static void __init node_mem_init(cnodeid_t node) 392 392 { 393 - pfn_t slot_firstpfn = slot_getbasepfn(node, 0); 394 - pfn_t slot_freepfn = node_getfirstfree(node); 393 + unsigned long slot_firstpfn = slot_getbasepfn(node, 0); 394 + unsigned long slot_freepfn = node_getfirstfree(node); 395 395 unsigned long bootmap_size; 396 - pfn_t start_pfn, end_pfn; 396 + unsigned long start_pfn, end_pfn; 397 397 398 398 get_pfn_range_for_nid(node, &start_pfn, &end_pfn); 399 399 ··· 467 467 pagetable_init(); 468 468 469 469 for_each_online_node(node) { 470 - pfn_t start_pfn, end_pfn; 470 + unsigned long start_pfn, end_pfn; 471 471 472 472 get_pfn_range_for_nid(node, &start_pfn, &end_pfn); 473 473