diff options
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/alpha/alpha/autoconf.c | 4 | ||||
| -rw-r--r-- | sys/arch/alpha/alpha/machdep.c | 6 | ||||
| -rw-r--r-- | sys/arch/alpha/include/cpu.h | 5 |
3 files changed, 4 insertions, 11 deletions
diff --git a/sys/arch/alpha/alpha/autoconf.c b/sys/arch/alpha/alpha/autoconf.c index 22dcba852d5..bf9562ea2eb 100644 --- a/sys/arch/alpha/alpha/autoconf.c +++ b/sys/arch/alpha/alpha/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.32 2008/07/21 04:35:53 todd Exp $ */ +/* $OpenBSD: autoconf.c,v 1.33 2010/11/28 21:00:03 miod Exp $ */ /* $NetBSD: autoconf.c,v 1.16 1996/11/13 21:13:04 cgd Exp $ */ /* @@ -59,8 +59,6 @@ #include <dev/cons.h> -extern char root_device[17]; /* XXX */ - struct device *booted_device; int booted_partition; struct bootdev_data *bootdev_data; diff --git a/sys/arch/alpha/alpha/machdep.c b/sys/arch/alpha/alpha/machdep.c index eccb1937570..9a64256b849 100644 --- a/sys/arch/alpha/alpha/machdep.c +++ b/sys/arch/alpha/alpha/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.127 2010/06/30 20:38:49 tedu Exp $ */ +/* $OpenBSD: machdep.c,v 1.128 2010/11/28 21:00:03 miod Exp $ */ /* $NetBSD: machdep.c,v 1.210 2000/06/01 17:12:38 thorpej Exp $ */ /*- @@ -180,7 +180,6 @@ int bootdev_debug = 0; /* patchable, or from DDB */ /* the following is used externally (sysctl_hw) */ char machine[] = MACHINE; /* from <machine/param.h> */ char cpu_model[128]; -char root_device[17]; struct user *proc0paddr; @@ -1650,9 +1649,6 @@ cpu_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p) return (sysctl_rdstruct(oldp, oldlenp, newp, &consdev, sizeof consdev)); - case CPU_ROOT_DEVICE: - return (sysctl_rdstring(oldp, oldlenp, newp, - root_device)); #ifndef SMALL_KERNEL case CPU_UNALIGNED_PRINT: return (sysctl_int(oldp, oldlenp, newp, newlen, diff --git a/sys/arch/alpha/include/cpu.h b/sys/arch/alpha/include/cpu.h index 586eb8a42b8..44f24f800e9 100644 --- a/sys/arch/alpha/include/cpu.h +++ b/sys/arch/alpha/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.41 2010/09/28 20:27:54 miod Exp $ */ +/* $OpenBSD: cpu.h,v 1.42 2010/11/28 21:00:04 miod Exp $ */ /* $NetBSD: cpu.h,v 1.45 2000/08/21 02:03:12 thorpej Exp $ */ /*- @@ -339,7 +339,6 @@ do { \ * CTL_MACHDEP definitions. */ #define CPU_CONSDEV 1 /* dev_t: console terminal device */ -#define CPU_ROOT_DEVICE 2 /* string: root device name */ #define CPU_UNALIGNED_PRINT 3 /* int: print unaligned accesses */ #define CPU_UNALIGNED_FIX 4 /* int: fix unaligned accesses */ #define CPU_UNALIGNED_SIGBUS 5 /* int: SIGBUS unaligned accesses */ @@ -362,7 +361,7 @@ do { \ #define CTL_MACHDEP_NAMES { \ { 0, 0 }, \ { "console_device", CTLTYPE_STRUCT }, \ - { "root_device", CTLTYPE_STRING }, \ + { 0, 0 }, \ { "unaligned_print", CTLTYPE_INT }, \ { "unaligned_fix", CTLTYPE_INT }, \ { "unaligned_sigbus", CTLTYPE_INT }, \ |