RB_MINIROOT is never checked by anything, so stop setting it.
authorderaadt <deraadt@openbsd.org>
Sun, 20 Jul 2014 18:24:34 +0000 (18:24 +0000)
committerderaadt <deraadt@openbsd.org>
Sun, 20 Jul 2014 18:24:34 +0000 (18:24 +0000)
sys/arch/alpha/alpha/machdep.c
sys/arch/sparc64/include/boot_flag.h

index 3ec9470..204a890 100644 (file)
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.162 2014/07/13 22:53:38 uebayasi Exp $ */
+/* $OpenBSD: machdep.c,v 1.163 2014/07/20 18:24:34 deraadt Exp $ */
 /* $NetBSD: machdep.c,v 1.210 2000/06/01 17:12:38 thorpej Exp $ */
 
 /*-
@@ -721,12 +721,6 @@ nobootinfo:
                        boothowto |= RB_HALT;
                        break;
 
-#if 0
-               case 'm': /* mini root present in memory */
-               case 'M':
-                       boothowto |= RB_MINIROOT;
-                       break;
-#endif
 
                case 'n': /* askname */
                case 'N':
index c95eae9..77518f1 100644 (file)
@@ -1,4 +1,4 @@
-/*     $OpenBSD: boot_flag.h,v 1.3 2011/03/23 16:54:37 pirofti Exp $   */
+/*     $OpenBSD: boot_flag.h,v 1.4 2014/07/20 18:24:34 deraadt Exp $   */
 /*     $NetBSD: boot_flag.h,v 1.3 2001/07/01 02:56:21 gmcgarry Exp $   */
 
 /*-
@@ -53,9 +53,6 @@
        case 'd': /* break into the kernel debugger ASAP (if compiled in) */ \
                (retval) |= RB_KDB;                             \
                break;                                          \
-       case 'm': /* mini root present in memory */             \
-               (retval) |= RB_MINIROOT;                        \
-               break;                                          \
        case 's': /* boot to single user */                     \
                (retval) |= RB_SINGLE;                          \
                break;                                          \