lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MIPS: IP27: Remove pfn_t.

Browse Source 
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>
This commit is contained in:
Ralf Baechle
2013-05-08 03:51:58 +02:00
parent f6161aa153
commit fc0460d0df
4 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/mips/include/asm/sn/sn_private.h
View File

@@ -14,6 +14,6 @@ extern void install_cpu_nmi_handler(int slice);
extern void install_ipi(void); extern void install_ipi(void);
extern void setup_replication_mask(void); extern void setup_replication_mask(void);
extern void replicate_kernel_text(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 */ #endif /* __ASM_SN_SN_PRIVATE_H */

1
arch/mips/include/asm/sn/types.h
View File

@@ -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 moduleid_t; /* user-visible module number type */
typedef signed short cmoduleid_t; /* kernel compact module id type */ typedef signed short cmoduleid_t; /* kernel compact module id type */
typedef unsigned char clusterid_t; /* Clusterid of the cell */ typedef unsigned char clusterid_t; /* Clusterid of the cell */
typedef unsigned long pfn_t;
typedef dev_t vertex_hdl_t; /* hardware graph vertex handle */ typedef dev_t vertex_hdl_t; /* hardware graph vertex handle */

2
arch/mips/sgi-ip27/ip27-klnuma.c
View File

@@ -114,7 +114,7 @@ void __init replicate_kernel_text()
* data structures on the first couple of pages of the first slot of each * 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). * 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; unsigned long loadbase = REP_BASE;
nasid_t nasid = COMPACT_TO_NASID_NODEID(cnode); nasid_t nasid = COMPACT_TO_NASID_NODEID(cnode);

16
arch/mips/sgi-ip27/ip27-memory.c
View File

@@ -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); 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; nasid_t nasid;
lboard_t *brd; lboard_t *brd;
@@ -353,7 +353,7 @@ static void __init mlreset(void)
static void __init szmem(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; int slot;
cnodeid_t node; cnodeid_t node;
@@ -390,10 +390,10 @@ static void __init szmem(void)
static void __init node_mem_init(cnodeid_t node) static void __init node_mem_init(cnodeid_t node)
{ {
pfn_t slot_firstpfn = slot_getbasepfn(node, 0); unsigned long slot_firstpfn = slot_getbasepfn(node, 0);
pfn_t slot_freepfn = node_getfirstfree(node); unsigned long slot_freepfn = node_getfirstfree(node);
unsigned long bootmap_size; 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); get_pfn_range_for_nid(node, &start_pfn, &end_pfn);
@@ -467,7 +467,7 @@ void __init paging_init(void)
pagetable_init(); pagetable_init();
for_each_online_node(node) { 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); get_pfn_range_for_nid(node, &start_pfn, &end_pfn);