Import of Linux/MIPS 2.1.36

1 files changed, 17 insertions, 2 deletions

diff --git a/include/asm-sparc/oplib.h b/include/asm-sparc/oplib.h
index 84248e0eb..40c6de10b 100644
--- a/include/asm-sparc/oplib.h
+++ b/include/asm-sparc/oplib.h
@@ -1,4 +1,4 @@
-/* $Id: oplib.h,v 1.12 1996/10/31 06:29:13 davem Exp $
+/* $Id: oplib.h,v 1.15 1997/03/18 18:00:18 jj Exp $
  * oplib.h:  Describes the interface and available routines in the
  *           Linux Prom library.
  *
@@ -31,6 +31,9 @@ extern unsigned int prom_rev, prom_prev;
  */
 extern int prom_root_node;
 
+/* PROM stdin and stdout */
+extern int prom_stdin, prom_stdout;
+
 /* Pointer to prom structure containing the device tree traversal
  * and usage utility functions.  Only prom-lib should use these,
  * users use the interface defined by the library only!
@@ -108,7 +111,7 @@ extern void prom_cmdline(void);
 /* Enter the prom, with no chance of continuation for the stand-alone
  * which calls this.
  */
-extern void prom_halt(void);
+extern void prom_halt(void) __attribute__ ((noreturn));
 
 /* Set the PROM 'sync' callback function to the passed function pointer.
  * When the user gives the 'sync' command at the prom prompt while the
@@ -208,8 +211,20 @@ extern void prom_free(char *virt_addr, unsigned int size);
 extern void prom_putsegment(int context, unsigned long virt_addr,
 			    int physical_segment);
 
+
 /* PROM device tree traversal functions... */
 
+#ifdef PROMLIB_INTERNAL
+
+/* Internal version of prom_getchild. */
+extern int __prom_getchild(int parent_node);
+
+/* Internal version of prom_getsibling. */
+extern int __prom_getsibling(int node);
+
+#endif
+
+
 /* Get the child node of the given node, or zero if no child exists. */
 extern int prom_getchild(int parent_node);