MIPS: IP27: Remove pfn_t.

ralfbaechle · ralfbaechle · commit fc0460d0dfb1 · 2013-05-08T03:51:58.000+02:00
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 &lt;ralf@linux-mips.org&gt;
diff --git a/arch/mips/include/asm/sn/sn_private.h b/arch/mips/include/asm/sn/sn_private.h
@@ -14,6 +14,6 @@ extern void install_cpu_nmi_handler(int slice);
 extern void install_ipi(void);
 extern void setup_replication_mask(void);
 extern void replicate_kernel_text(void);
-extern pfn_t node_getfirstfree(cnodeid_t);
+extern unsigned long node_getfirstfree(cnodeid_t);
 
 #endif /* __ASM_SN_SN_PRIVATE_H */
diff --git a/arch/mips/include/asm/sn/types.h b/arch/mips/include/asm/sn/types.h
@@ -19,7 +19,6 @@ typedef signed char	partid_t;	/* partition ID type */
 typedef signed short	moduleid_t;	/* user-visible module number type */
 typedef signed short	cmoduleid_t;	/* kernel compact module id type */
 typedef unsigned char	clusterid_t;	/* Clusterid of the cell */
-typedef unsigned long	pfn_t;
 
 typedef dev_t		vertex_hdl_t;	/* hardware graph vertex handle */
 
diff --git 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()
  * data structures on the first couple of pages of the first slot of each
  * node. If this is the case, getfirstfree(node) > getslotstart(node, 0).
  */
-pfn_t node_getfirstfree(cnodeid_t cnode)
+unsigned long node_getfirstfree(cnodeid_t cnode)
 {
 	unsigned long loadbase = REP_BASE;
 	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
@@ -255,14 +255,14 @@ static void __init dump_topology(void)
 	}
 }
 
-static pfn_t __init slot_getbasepfn(cnodeid_t cnode, int slot)
+static unsigned long __init slot_getbasepfn(cnodeid_t cnode, int slot)
 {
 	nasid_t nasid = COMPACT_TO_NASID_NODEID(cnode);
 
-	return ((pfn_t)nasid << PFN_NASIDSHFT) | (slot << SLOT_PFNSHIFT);
+	return ((unsigned long)nasid << PFN_NASIDSHFT) | (slot << SLOT_PFNSHIFT);
 }
 
-static pfn_t __init slot_psize_compute(cnodeid_t node, int slot)
+static unsigned long __init slot_psize_compute(cnodeid_t node, int slot)
 {
 	nasid_t nasid;
 	lboard_t *brd;
@@ -353,7 +353,7 @@ static void __init mlreset(void)
 
 static void __init szmem(void)
 {
-	pfn_t slot_psize, slot0sz = 0, nodebytes;	/* Hack to detect problem configs */
+	unsigned long slot_psize, slot0sz = 0, nodebytes;	/* Hack to detect problem configs */
 	int slot;
 	cnodeid_t node;
 
@@ -390,10 +390,10 @@ static void __init szmem(void)
 
 static void __init node_mem_init(cnodeid_t node)
 {
-	pfn_t slot_firstpfn = slot_getbasepfn(node, 0);
-	pfn_t slot_freepfn = node_getfirstfree(node);
+	unsigned long slot_firstpfn = slot_getbasepfn(node, 0);
+	unsigned long slot_freepfn = node_getfirstfree(node);
 	unsigned long bootmap_size;
-	pfn_t start_pfn, end_pfn;
+	unsigned long start_pfn, end_pfn;
 
 	get_pfn_range_for_nid(node, &start_pfn, &end_pfn);
 
@@ -467,7 +467,7 @@ void __init paging_init(void)
 	pagetable_init();
 
 	for_each_online_node(node) {
-		pfn_t start_pfn, end_pfn;
+		unsigned long start_pfn, end_pfn;
 
 		get_pfn_range_for_nid(node, &start_pfn, &end_pfn);
 

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ void __init replicate_kernel_text()`
`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);`
Original file line number	Diff line number	Diff line change
`@@ -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`	`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,7 +353,7 @@ static void __init mlreset(void)`
`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,10 +390,10 @@ static void __init szmem(void)`
`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,7 +467,7 @@ void __init paging_init(void)`
`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`