[src/trunk]: src/sys/arch/arm32 Remove a shark dependency in machdep. Use bo...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a6c46d40c178
branches:  trunk
changeset: 504476:a6c46d40c178
user:      matt <matt%NetBSD.org@localhost>
date:      Sun Mar 04 01:50:53 2001 +0000

description:
Remove a shark dependency in machdep.  Use booted_kernel instead of
boot_kernel to be similiar to booted_device.

diffstat:

 sys/arch/arm32/arm32/machdep.c       |  15 +++++----------
 sys/arch/arm32/shark/shark_machdep.c |   6 +++---
 2 files changed, 8 insertions(+), 13 deletions(-)

diffs (74 lines):

diff -r a5d3b6a0fa2d -r a6c46d40c178 sys/arch/arm32/arm32/machdep.c
--- a/sys/arch/arm32/arm32/machdep.c    Sun Mar 04 01:36:35 2001 +0000
+++ b/sys/arch/arm32/arm32/machdep.c    Sun Mar 04 01:50:53 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.86 2001/02/28 18:15:43 bjh21 Exp $       */
+/*     $NetBSD: machdep.c,v 1.87 2001/03/04 01:50:53 matt Exp $        */
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -116,6 +116,8 @@
 
 struct user *proc0paddr;
 
+char *booted_kernel;
+
 /* Prototypes */
 
 void consinit          __P((void));
@@ -141,10 +143,6 @@
 extern void pmap_debug __P((int level));
 #endif /* PMAP_DEBUG */
 
-#if defined(SHARK)
-int shark_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp,
-       void *newp, size_t newlen, struct proc *p);
-#endif
 /*
  * Debug function just to park the CPU
  */
@@ -618,15 +616,12 @@
                return (sysctl_rdstruct(oldp, oldlenp, newp, &consdev,
                        sizeof consdev));
        }
-#if defined(SHARK)
        case CPU_BOOTED_KERNEL: {
-               extern char *boot_kernel;
-               if (boot_kernel != NULL && boot_kernel[0] != '\0')
+               if (booted_kernel != NULL && booted_kernel[0] != '\0')
                        return sysctl_rdstring(oldp, oldlenp, newp,
-                           boot_kernel);
+                           booted_kernel);
                return (EOPNOTSUPP);
        }
-#endif
 
        default:
                return (EOPNOTSUPP);
diff -r a5d3b6a0fa2d -r a6c46d40c178 sys/arch/arm32/shark/shark_machdep.c
--- a/sys/arch/arm32/shark/shark_machdep.c      Sun Mar 04 01:36:35 2001 +0000
+++ b/sys/arch/arm32/shark/shark_machdep.c      Sun Mar 04 01:50:53 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: shark_machdep.c,v 1.19 2000/06/29 08:53:03 mrg Exp $   */
+/*     $NetBSD: shark_machdep.c,v 1.20 2001/03/04 01:50:54 matt Exp $  */
 
 /*
  * Copyright 1997
@@ -118,7 +118,7 @@
 BootConfig bootconfig;
 char *boot_args = NULL;
 char *boot_file = NULL;
-char *boot_kernel = NULL;
+extern char *booted_kernel;
 #ifndef PMAP_STATIC_L1S
 int max_processes = 64;                        /* Default number */
 #endif /* !PMAP_STATIC_L1S */
@@ -408,7 +408,7 @@
                        *cp++ = '\0';
                        if (cp[0] == '\\')
                                cp++;
-                       boot_kernel = cp; 
+                       booted_kernel = cp; 
                }
        }