Merge /home/trondmy/scm/kernel/git/torvalds/linux-2.6

10 files changed, 49 insertions, 288 deletions

diff --git a/arch/sparc64/prom/Makefile b/arch/sparc64/prom/Makefile
index 8f2420d9e9e6..3d33ed27bc27 100644
--- a/arch/sparc64/prom/Makefile
+++ b/arch/sparc64/prom/Makefile
@@ -6,5 +6,5 @@
 EXTRA_AFLAGS := -ansi
 EXTRA_CFLAGS := -Werror
 
-lib-y   := bootstr.o devops.o init.o memory.o misc.o \
-           tree.o console.o printf.o p1275.o map.o cif.o
+lib-y   := bootstr.o devops.o init.o misc.o \
+           tree.o console.o printf.o p1275.o cif.o
diff --git a/arch/sparc64/prom/console.c b/arch/sparc64/prom/console.c
index 028a53fcb1ec..eae5db8dda56 100644
--- a/arch/sparc64/prom/console.c
+++ b/arch/sparc64/prom/console.c
@@ -67,7 +67,7 @@ prom_putchar(char c)
 }
 
 void
-prom_puts(char *s, int len)
+prom_puts(const char *s, int len)
 {
         p1275_cmd("write", P1275_ARG(1,P1275_ARG_IN_BUF)|
                            P1275_INOUT(3,1),
diff --git a/arch/sparc64/prom/devops.c b/arch/sparc64/prom/devops.c
index 2c99b21b6981..4641839eb39a 100644
--- a/arch/sparc64/prom/devops.c
+++ b/arch/sparc64/prom/devops.c
@@ -16,7 +16,7 @@
  * Returns 0 on failure.
  */
 int
-prom_devopen(char *dstr)
+prom_devopen(const char *dstr)
 {
         return p1275_cmd ("open", P1275_ARG(0,P1275_ARG_IN_STRING)|
                                   P1275_INOUT(1,1),
diff --git a/arch/sparc64/prom/init.c b/arch/sparc64/prom/init.c
index 817faae058cd..f3cc2d8578b2 100644
--- a/arch/sparc64/prom/init.c
+++ b/arch/sparc64/prom/init.c
@@ -27,7 +27,6 @@ int prom_chosen_node;
  * failure.  It gets passed the pointer to the PROM vector.
  */
 
-extern void prom_meminit(void);
 extern void prom_cif_init(void *, void *);
 
 void __init prom_init(void *cif_handler, void *cif_stack)
@@ -46,7 +45,7 @@ void __init prom_init(void *cif_handler, void *cif_stack)
         if((prom_root_node == 0) || (prom_root_node == -1))
                 prom_halt();
 
-        prom_chosen_node = prom_finddevice("/chosen");
+        prom_chosen_node = prom_finddevice(prom_chosen_path);
         if (!prom_chosen_node || prom_chosen_node == -1)
                 prom_halt();
 
@@ -90,8 +89,6 @@ void __init prom_init(void *cif_handler, void *cif_stack)
 
         printk ("PROMLIB: Sun IEEE Boot Prom %s\n", buffer + bufadjust);
 
-        prom_meminit();
-
         /* Initialization successful. */
         return;
 
diff --git a/arch/sparc64/prom/map.S b/arch/sparc64/prom/map.S
deleted file mode 100644
index 21b3f9c99ea7..000000000000
--- a/arch/sparc64/prom/map.S
+++ /dev/null
@@ -1,72 +0,0 @@
-/* $Id: map.S,v 1.2 1999/11/19 05:53:02 davem Exp $
- * map.S: Tricky coding required to fixup the kernel OBP maps
- *        properly.
- *
- * Copyright (C) 1999 David S. Miller (davem@redhat.com)
- */
-
-        .text
-        .align  8192
-        .globl  prom_boot_page
-prom_boot_page:
-call_method:
-        .asciz  "call-method"
-        .align  8
-map:
-        .asciz  "map"
-        .align  8
-
-        /* When we are invoked, our caller has remapped us to
-         * page zero, therefore we must use PC relative addressing
-         * for everything after we begin performing the unmap/map
-         * calls.
-         */
-        .globl  prom_remap
-prom_remap:     /* %o0 = physpage, %o1 = virtpage, %o2 = mmu_ihandle */
-        rd      %pc, %g1
-        srl     %o2, 0, %o2                     ! kill sign extension
-        sethi   %hi(p1275buf), %g2
-        or      %g2, %lo(p1275buf), %g2
-        ldx     [%g2 + 0x10], %g3               ! prom_cif_stack
-        save    %g3, -(192 + 128), %sp
-        ldx     [%g2 + 0x08], %l0               ! prom_cif_handler
-        mov     %g6, %i3
-        mov     %g4, %i4
-        mov     %g5, %i5
-        flushw
-
-        sethi   %hi(prom_remap - call_method), %g7
-        or      %g7, %lo(prom_remap - call_method), %g7
-        sub     %g1, %g7, %l2                   ! call-method string
-        sethi   %hi(prom_remap - map), %g7
-        or      %g7, %lo(prom_remap - map), %g7
-        sub     %g1, %g7, %l4                   ! map string
-
-        /* OK, map the 4MB region we really live at. */
-        stx     %l2, [%sp + 2047 + 128 + 0x00]  ! call-method
-        mov     7, %l5
-        stx     %l5, [%sp + 2047 + 128 + 0x08]  ! num_args
-        mov     1, %l5
-        stx     %l5, [%sp + 2047 + 128 + 0x10]  ! num_rets
-        stx     %l4, [%sp + 2047 + 128 + 0x18]  ! map
-        stx     %i2, [%sp + 2047 + 128 + 0x20]  ! mmu_ihandle
-        mov     -1, %l5
-        stx     %l5, [%sp + 2047 + 128 + 0x28]  ! mode == default
-        sethi   %hi(4 * 1024 * 1024), %l5
-        stx     %l5, [%sp + 2047 + 128 + 0x30]  ! size
-        stx     %i1, [%sp + 2047 + 128 + 0x38]  ! vaddr
-        stx     %g0, [%sp + 2047 + 128 + 0x40]  ! filler
-        stx     %i0, [%sp + 2047 + 128 + 0x48]  ! paddr
-        call    %l0
-         add    %sp, (2047 + 128), %o0          ! argument array
-
-        /* Restore hard-coded globals. */
-        mov     %i3, %g6
-        mov     %i4, %g4
-        mov     %i5, %g5
-
-        /* Wheee.... we are done. */
-        ret
-        restore
-
-        .align  8192
diff --git a/arch/sparc64/prom/memory.c b/arch/sparc64/prom/memory.c
deleted file mode 100644
index f4a8143e052c..000000000000
--- a/arch/sparc64/prom/memory.c
+++ /dev/null
@@ -1,152 +0,0 @@
-/* $Id: memory.c,v 1.5 1999/08/31 06:55:04 davem Exp $
- * memory.c: Prom routine for acquiring various bits of information
- *           about RAM on the machine, both virtual and physical.
- *
- * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
- * Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-
-#include <asm/openprom.h>
-#include <asm/oplib.h>
-
-/* This routine, for consistency, returns the ram parameters in the
- * V0 prom memory descriptor format.  I choose this format because I
- * think it was the easiest to work with.  I feel the religious
- * arguments now... ;)  Also, I return the linked lists sorted to
- * prevent paging_init() upset stomach as I have not yet written
- * the pepto-bismol kernel module yet.
- */
-
-struct linux_prom64_registers prom_reg_memlist[64];
-struct linux_prom64_registers prom_reg_tmp[64];
-
-struct linux_mlist_p1275 prom_phys_total[64];
-struct linux_mlist_p1275 prom_prom_taken[64];
-struct linux_mlist_p1275 prom_phys_avail[64];
-
-struct linux_mlist_p1275 *prom_ptot_ptr = prom_phys_total;
-struct linux_mlist_p1275 *prom_ptak_ptr = prom_prom_taken;
-struct linux_mlist_p1275 *prom_pavl_ptr = prom_phys_avail;
-
-struct linux_mem_p1275 prom_memlist;
-
-
-/* Internal Prom library routine to sort a linux_mlist_p1275 memory
- * list.  Used below in initialization.
- */
-static void __init
-prom_sortmemlist(struct linux_mlist_p1275 *thislist)
-{
-        int swapi = 0;
-        int i, mitr;
-        unsigned long tmpaddr, tmpsize;
-        unsigned long lowest;
-
-        for(i=0; thislist[i].theres_more; i++) {
-                lowest = thislist[i].start_adr;
-                for(mitr = i+1; thislist[mitr-1].theres_more; mitr++)
-                        if(thislist[mitr].start_adr < lowest) {
-                                lowest = thislist[mitr].start_adr;
-                                swapi = mitr;
-                        }
-                if(lowest == thislist[i].start_adr) continue;
-                tmpaddr = thislist[swapi].start_adr;
-                tmpsize = thislist[swapi].num_bytes;
-                for(mitr = swapi; mitr > i; mitr--) {
-                        thislist[mitr].start_adr = thislist[mitr-1].start_adr;
-                        thislist[mitr].num_bytes = thislist[mitr-1].num_bytes;
-                }
-                thislist[i].start_adr = tmpaddr;
-                thislist[i].num_bytes = tmpsize;
-        }
-}
-
-/* Initialize the memory lists based upon the prom version. */
-void __init prom_meminit(void)
-{
-        int node = 0;
-        unsigned int iter, num_regs;
-
-        node = prom_finddevice("/memory");
-        num_regs = prom_getproperty(node, "available",
-                                    (char *) prom_reg_memlist,
-                                    sizeof(prom_reg_memlist));
-        num_regs = (num_regs/sizeof(struct linux_prom64_registers));
-        for(iter=0; iter<num_regs; iter++) {
-                prom_phys_avail[iter].start_adr =
-                        prom_reg_memlist[iter].phys_addr;
-                prom_phys_avail[iter].num_bytes =
-                        prom_reg_memlist[iter].reg_size;
-                prom_phys_avail[iter].theres_more =
-                        &prom_phys_avail[iter+1];
-        }
-        prom_phys_avail[iter-1].theres_more = NULL;
-
-        num_regs = prom_getproperty(node, "reg",
-                                    (char *) prom_reg_memlist,
-                                    sizeof(prom_reg_memlist));
-        num_regs = (num_regs/sizeof(struct linux_prom64_registers));
-        for(iter=0; iter<num_regs; iter++) {
-                prom_phys_total[iter].start_adr =
-                        prom_reg_memlist[iter].phys_addr;
-                prom_phys_total[iter].num_bytes =
-                        prom_reg_memlist[iter].reg_size;
-                prom_phys_total[iter].theres_more =
-                        &prom_phys_total[iter+1];
-        }
-        prom_phys_total[iter-1].theres_more = NULL;
-
-        node = prom_finddevice("/virtual-memory");
-        num_regs = prom_getproperty(node, "available",
-                                    (char *) prom_reg_memlist,
-                                    sizeof(prom_reg_memlist));
-        num_regs = (num_regs/sizeof(struct linux_prom64_registers));
-
-        /* Convert available virtual areas to taken virtual
-         * areas.  First sort, then convert.
-         */
-        for(iter=0; iter<num_regs; iter++) {
-                prom_prom_taken[iter].start_adr =
-                        prom_reg_memlist[iter].phys_addr;
-                prom_prom_taken[iter].num_bytes =
-                        prom_reg_memlist[iter].reg_size;
-                prom_prom_taken[iter].theres_more =
-                        &prom_prom_taken[iter+1];
-        }
-        prom_prom_taken[iter-1].theres_more = NULL;
-
-        prom_sortmemlist(prom_prom_taken);
-
-        /* Finally, convert. */
-        for(iter=0; iter<num_regs; iter++) {
-                prom_prom_taken[iter].start_adr =
-                        prom_prom_taken[iter].start_adr +
-                        prom_prom_taken[iter].num_bytes;
-                prom_prom_taken[iter].num_bytes =
-                        prom_prom_taken[iter+1].start_adr -
-                        prom_prom_taken[iter].start_adr;
-        }
-        prom_prom_taken[iter-1].num_bytes =
-                -1UL - prom_prom_taken[iter-1].start_adr;
-
-        /* Sort the other two lists. */
-        prom_sortmemlist(prom_phys_total);
-        prom_sortmemlist(prom_phys_avail);
-
-        /* Link all the lists into the top-level descriptor. */
-        prom_memlist.p1275_totphys=&prom_ptot_ptr;
-        prom_memlist.p1275_prommap=&prom_ptak_ptr;
-        prom_memlist.p1275_available=&prom_pavl_ptr;
-}
-
-/* This returns a pointer to our libraries internal p1275 format
- * memory descriptor.
- */
-struct linux_mem_p1275 *
-prom_meminfo(void)
-{
-        return &prom_memlist;
-}
diff --git a/arch/sparc64/prom/misc.c b/arch/sparc64/prom/misc.c
index 19c44e97e9ee..87f5cfce23bb 100644
--- a/arch/sparc64/prom/misc.c
+++ b/arch/sparc64/prom/misc.c
@@ -17,14 +17,14 @@
 #include <asm/system.h>
 
 /* Reset and reboot the machine with the command 'bcommand'. */
-void prom_reboot(char *bcommand)
+void prom_reboot(const char *bcommand)
 {
         p1275_cmd("boot", P1275_ARG(0, P1275_ARG_IN_STRING) |
                   P1275_INOUT(1, 0), bcommand);
 }
 
 /* Forth evaluate the expression contained in 'fstring'. */
-void prom_feval(char *fstring)
+void prom_feval(const char *fstring)
 {
         if (!fstring || fstring[0] == 0)
                 return;
@@ -68,19 +68,11 @@ void prom_cmdline(void)
         local_irq_restore(flags);
 }
 
-#ifdef CONFIG_SMP
-extern void smp_promstop_others(void);
-#endif
-
 /* Drop into the prom, but completely terminate the program.
  * No chance of continuing.
  */
 void prom_halt(void)
 {
-#ifdef CONFIG_SMP
-        smp_promstop_others();
-        udelay(8000);
-#endif
 again:
         p1275_cmd("exit", P1275_INOUT(0, 0));
         goto again; /* PROM is out to get me -DaveM */
@@ -88,10 +80,6 @@ again:
 
 void prom_halt_power_off(void)
 {
-#ifdef CONFIG_SMP
-        smp_promstop_others();
-        udelay(8000);
-#endif
         p1275_cmd("SUNW,power-off", P1275_INOUT(0, 0));
 
         /* if nothing else helps, we just halt */
@@ -148,21 +136,19 @@ void prom_set_trap_table(unsigned long tba)
         p1275_cmd("SUNW,set-trap-table", P1275_INOUT(1, 0), tba);
 }
 
-int mmu_ihandle_cache = 0;
-
 int prom_get_mmu_ihandle(void)
 {
         int node, ret;
 
-        if (mmu_ihandle_cache != 0)
-                return mmu_ihandle_cache;
+        if (prom_mmu_ihandle_cache != 0)
+                return prom_mmu_ihandle_cache;
 
-        node = prom_finddevice("/chosen");
-        ret = prom_getint(node, "mmu");
+        node = prom_finddevice(prom_chosen_path);
+        ret = prom_getint(node, prom_mmu_name);
         if (ret == -1 || ret == 0)
-                mmu_ihandle_cache = -1;
+                prom_mmu_ihandle_cache = -1;
         else
-                mmu_ihandle_cache = ret;
+                prom_mmu_ihandle_cache = ret;
 
         return ret;
 }
@@ -190,7 +176,7 @@ long prom_itlb_load(unsigned long index,
                     unsigned long tte_data,
                     unsigned long vaddr)
 {
-        return p1275_cmd("call-method",
+        return p1275_cmd(prom_callmethod_name,
                          (P1275_ARG(0, P1275_ARG_IN_STRING) |
                           P1275_ARG(2, P1275_ARG_IN_64B) |
                           P1275_ARG(3, P1275_ARG_IN_64B) |
@@ -207,7 +193,7 @@ long prom_dtlb_load(unsigned long index,
                     unsigned long tte_data,
                     unsigned long vaddr)
 {
-        return p1275_cmd("call-method",
+        return p1275_cmd(prom_callmethod_name,
                          (P1275_ARG(0, P1275_ARG_IN_STRING) |
                           P1275_ARG(2, P1275_ARG_IN_64B) |
                           P1275_ARG(3, P1275_ARG_IN_64B) |
@@ -223,13 +209,13 @@ long prom_dtlb_load(unsigned long index,
 int prom_map(int mode, unsigned long size,
              unsigned long vaddr, unsigned long paddr)
 {
-        int ret = p1275_cmd("call-method",
+        int ret = p1275_cmd(prom_callmethod_name,
                             (P1275_ARG(0, P1275_ARG_IN_STRING) |
                              P1275_ARG(3, P1275_ARG_IN_64B) |
                              P1275_ARG(4, P1275_ARG_IN_64B) |
                              P1275_ARG(6, P1275_ARG_IN_64B) |
                              P1275_INOUT(7, 1)),
-                            "map",
+                            prom_map_name,
                             prom_get_mmu_ihandle(),
                             mode,
                             size,
@@ -244,12 +230,12 @@ int prom_map(int mode, unsigned long size,
 
 void prom_unmap(unsigned long size, unsigned long vaddr)
 {
-        p1275_cmd("call-method",
+        p1275_cmd(prom_callmethod_name,
                   (P1275_ARG(0, P1275_ARG_IN_STRING) |
                    P1275_ARG(2, P1275_ARG_IN_64B) |
                    P1275_ARG(3, P1275_ARG_IN_64B) |
                    P1275_INOUT(4, 0)),
-                  "unmap",
+                  prom_unmap_name,
                   prom_get_mmu_ihandle(),
                   size,
                   vaddr);
@@ -258,7 +244,7 @@ void prom_unmap(unsigned long size, unsigned long vaddr)
 /* Set aside physical memory which is not touched or modified
  * across soft resets.
  */
-unsigned long prom_retain(char *name,
+unsigned long prom_retain(const char *name,
                           unsigned long pa_low, unsigned long pa_high,
                           long size, long align)
 {
@@ -290,7 +276,7 @@ int prom_getunumber(int syndrome_code,
                     unsigned long phys_addr,
                     char *buf, int buflen)
 {
-        return p1275_cmd("call-method",
+        return p1275_cmd(prom_callmethod_name,
                          (P1275_ARG(0, P1275_ARG_IN_STRING)     |
                           P1275_ARG(3, P1275_ARG_OUT_BUF)       |
                           P1275_ARG(6, P1275_ARG_IN_64B)        |
diff --git a/arch/sparc64/prom/p1275.c b/arch/sparc64/prom/p1275.c
index 59fe38bba39e..a5a7c5712028 100644
--- a/arch/sparc64/prom/p1275.c
+++ b/arch/sparc64/prom/p1275.c
@@ -46,7 +46,7 @@ static inline unsigned long spitfire_get_primary_context(void)
  */
 DEFINE_SPINLOCK(prom_entry_lock);
 
-long p1275_cmd (char *service, long fmt, ...)
+long p1275_cmd(const char *service, long fmt, ...)
 {
         char *p, *q;
         unsigned long flags;
diff --git a/arch/sparc64/prom/printf.c b/arch/sparc64/prom/printf.c
index a6df82cafa0d..660943ee4c2a 100644
--- a/arch/sparc64/prom/printf.c
+++ b/arch/sparc64/prom/printf.c
@@ -34,7 +34,7 @@ prom_write(const char *buf, unsigned int n)
 }
 
 void
-prom_printf(char *fmt, ...)
+prom_printf(const char *fmt, ...)
 {
         va_list args;
         int i;
diff --git a/arch/sparc64/prom/tree.c b/arch/sparc64/prom/tree.c
index ccf73258ebf7..b1ff9e87dcc6 100644
--- a/arch/sparc64/prom/tree.c
+++ b/arch/sparc64/prom/tree.c
@@ -69,7 +69,7 @@ prom_getsibling(int node)
  * Return -1 on error.
  */
 __inline__ int
-prom_getproplen(int node, char *prop)
+prom_getproplen(int node, const char *prop)
 {
         if((!node) || (!prop)) return -1;
         return p1275_cmd ("getproplen", 
@@ -83,20 +83,20 @@ prom_getproplen(int node, char *prop)
  * was successful the length will be returned, else -1 is returned.
  */
 __inline__ int
-prom_getproperty(int node, char *prop, char *buffer, int bufsize)
+prom_getproperty(int node, const char *prop, char *buffer, int bufsize)
 {
         int plen;
 
         plen = prom_getproplen(node, prop);
-        if((plen > bufsize) || (plen == 0) || (plen == -1))
+        if ((plen > bufsize) || (plen == 0) || (plen == -1)) {
                 return -1;
-        else {
+        } else {
                 /* Ok, things seem all right. */
-                return p1275_cmd ("getprop", 
-                                  P1275_ARG(1,P1275_ARG_IN_STRING)|
-                                  P1275_ARG(2,P1275_ARG_OUT_BUF)|
-                                  P1275_INOUT(4, 1), 
-                                  node, prop, buffer, P1275_SIZE(plen));
+                return p1275_cmd(prom_getprop_name, 
+                                 P1275_ARG(1,P1275_ARG_IN_STRING)|
+                                 P1275_ARG(2,P1275_ARG_OUT_BUF)|
+                                 P1275_INOUT(4, 1), 
+                                 node, prop, buffer, P1275_SIZE(plen));
         }
 }
 
@@ -104,7 +104,7 @@ prom_getproperty(int node, char *prop, char *buffer, int bufsize)
  * on failure.
  */
 __inline__ int
-prom_getint(int node, char *prop)
+prom_getint(int node, const char *prop)
 {
         int intprop;
 
@@ -119,7 +119,7 @@ prom_getint(int node, char *prop)
  */
 
 int
-prom_getintdefault(int node, char *property, int deflt)
+prom_getintdefault(int node, const char *property, int deflt)
 {
         int retval;
 
@@ -131,7 +131,7 @@ prom_getintdefault(int node, char *property, int deflt)
 
 /* Acquire a boolean property, 1=TRUE 0=FALSE. */
 int
-prom_getbool(int node, char *prop)
+prom_getbool(int node, const char *prop)
 {
         int retval;
 
@@ -145,7 +145,7 @@ prom_getbool(int node, char *prop)
  * buffer.
  */
 void
-prom_getstring(int node, char *prop, char *user_buf, int ubuf_size)
+prom_getstring(int node, const char *prop, char *user_buf, int ubuf_size)
 {
         int len;
 
@@ -160,7 +160,7 @@ prom_getstring(int node, char *prop, char *user_buf, int ubuf_size)
  * YES = 1   NO = 0
  */
 int
-prom_nodematch(int node, char *name)
+prom_nodematch(int node, const char *name)
 {
         char namebuf[128];
         prom_getproperty(node, "name", namebuf, sizeof(namebuf));
@@ -172,7 +172,7 @@ prom_nodematch(int node, char *name)
  * 'nodename'.  Return node if successful, zero if not.
  */
 int
-prom_searchsiblings(int node_start, char *nodename)
+prom_searchsiblings(int node_start, const char *nodename)
 {
 
         int thisnode, error;
@@ -294,7 +294,7 @@ prom_firstprop(int node, char *buffer)
  * property types for this node.
  */
 __inline__ char *
-prom_nextprop(int node, char *oprop, char *buffer)
+prom_nextprop(int node, const char *oprop, char *buffer)
 {
         char buf[32];
 
@@ -314,15 +314,17 @@ prom_nextprop(int node, char *oprop, char *buffer)
 }
 
 int
-prom_finddevice(char *name)
+prom_finddevice(const char *name)
 {
-        if(!name) return 0;
-        return p1275_cmd ("finddevice", P1275_ARG(0,P1275_ARG_IN_STRING)|
-                                        P1275_INOUT(1, 1), 
-                                        name);
+        if (!name)
+                return 0;
+        return p1275_cmd(prom_finddev_name,
+                         P1275_ARG(0,P1275_ARG_IN_STRING)|
+                         P1275_INOUT(1, 1), 
+                         name);
 }
 
-int prom_node_has_property(int node, char *prop)
+int prom_node_has_property(int node, const char *prop)
 {
         char buf [32];
         
@@ -339,7 +341,7 @@ int prom_node_has_property(int node, char *prop)
  * of 'size' bytes.  Return the number of bytes the prom accepted.
  */
 int
-prom_setprop(int node, char *pname, char *value, int size)
+prom_setprop(int node, const char *pname, char *value, int size)
 {
         if(size == 0) return 0;
         if((pname == 0) || (value == 0)) return 0;
@@ -364,7 +366,7 @@ prom_inst2pkg(int inst)
  * FIXME: Should work for v0 as well
  */
 int
-prom_pathtoinode(char *path)
+prom_pathtoinode(const char *path)
 {
         int node, inst;