3 files changed, 7 insertions, 5 deletions

diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index f0434513df15..9b020d674373 100644
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -88,7 +88,7 @@ static void __init read_obp_memory(const char *property,
                                    struct linux_prom64_registers *regs,
                                    int *num_ents)
 {
-        int node = prom_finddevice("/memory");
+        phandle node = prom_finddevice("/memory");
         int prop_size = prom_getproplen(node, property);
         int ents, ret, i;
 
diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c
index b0b43aa5e45a..92319aa8b662 100644
--- a/arch/sparc/mm/srmmu.c
+++ b/arch/sparc/mm/srmmu.c
@@ -1262,7 +1262,8 @@ extern unsigned long bootmem_init(unsigned long *pages_avail);
 
 void __init srmmu_paging_init(void)
 {
-        int i, cpunode;
+        int i;
+        phandle cpunode;
         char node_str[128];
         pgd_t *pgd;
         pmd_t *pmd;
@@ -1398,7 +1399,8 @@ static void __init srmmu_is_bad(void)
 
 static void __init init_vac_layout(void)
 {
-        int nd, cache_lines;
+        phandle nd;
+        int cache_lines;
         char node_str[128];
 #ifdef CONFIG_SMP
         int cpu = 0;
@@ -2082,7 +2084,7 @@ static void __init get_srmmu_type(void)
 
         /* Next check for Fujitsu Swift. */
         if(psr_typ == 0 && psr_vers == 4) {
-                int cpunode;
+                phandle cpunode;
                 char node_str[128];
 
                 /* Look if it is not a TurboSparc emulating Swift... */
diff --git a/arch/sparc/mm/sun4c.c b/arch/sparc/mm/sun4c.c
index 4289f90f8697..ddd0d86e508e 100644
--- a/arch/sparc/mm/sun4c.c
+++ b/arch/sparc/mm/sun4c.c
@@ -420,7 +420,7 @@ volatile unsigned long __iomem *sun4c_memerr_reg = NULL;
 
 void __init sun4c_probe_memerr_reg(void)
 {
-        int node;
+        phandle node;
         struct linux_prom_registers regs[1];
 
         node = prom_getchild(prom_root_node);