Move loongson/octeon/sgi unmap_startup() under arch/mips64.

diff --git a/sys/arch/loongson/loongson/autoconf.c b/sys/arch/loongson/loongson/autoconf.c
index 00755ee..1a434a8 100644 (file)
--- a/sys/arch/loongson/loongson/autoconf.c
+++ b/sys/arch/loongson/loongson/autoconf.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: autoconf.c,v 1.7 2017/06/08 11:44:00 visa Exp $       */
+/*     $OpenBSD: autoconf.c,v 1.8 2017/06/08 12:02:52 visa Exp $       */
 /*
  * Copyright (c) 2009 Miodrag Vallat.
  *
@@ -34,17 +34,6 @@ enum devclass bootdev_class = DV_DULL;
 
 extern char pmon_bootp[];
 
-void
-unmap_startup(void)
-{
-       extern uint32_t kernel_text[], endboot[];
-       uint32_t *word = kernel_text;
-
-       /* Cannot unmap kseg0; smash with trap. */
-       while (word < endboot)
-               *word++ = 0x00000034u;  /* TEQ zero, zero */
-}
-
 void
 cpu_configure(void)
 {

diff --git a/sys/arch/mips64/include/autoconf.h b/sys/arch/mips64/include/autoconf.h
index 1a1519f..3d372b1 100644 (file)
--- a/sys/arch/mips64/include/autoconf.h
+++ b/sys/arch/mips64/include/autoconf.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: autoconf.h,v 1.1 2010/01/09 20:33:16 miod Exp $       */
+/*     $OpenBSD: autoconf.h,v 1.2 2017/06/08 12:02:52 visa Exp $       */
 
 /*
  * Copyright (c) 2010 Miodrag Vallat.
@@ -32,4 +32,6 @@ struct cpu_attach_args {
 
 extern struct cpu_hwinfo bootcpu_hwinfo;
 
+void   unmap_startup(void);
+
 #endif /* _MIPS64_AUTOCONF_H_ */

diff --git a/sys/arch/mips64/mips64/mips64_machdep.c b/sys/arch/mips64/mips64/mips64_machdep.c
index fb4a055..9e470b7 100644 (file)
--- a/sys/arch/mips64/mips64/mips64_machdep.c
+++ b/sys/arch/mips64/mips64/mips64_machdep.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: mips64_machdep.c,v 1.22 2017/05/29 11:46:49 visa Exp $ */
+/*     $OpenBSD: mips64_machdep.c,v 1.23 2017/06/08 12:02:52 visa Exp $ */
 
 /*
  * Copyright (c) 2009, 2010, 2012 Miodrag Vallat.
@@ -548,3 +548,17 @@ classify_insn(uint32_t insn)
 
        return INSNCLASS_NEUTRAL;
 }
+
+/*
+ * Smash the startup code. There is no way to really unmap it
+ * because the kernel runs in the kseg0 or xkphys space.
+ */
+void
+unmap_startup(void)
+{
+       extern uint32_t kernel_text[], endboot[];
+       uint32_t *word = kernel_text;
+
+       while (word < endboot)
+               *word++ = 0x00000034u;  /* TEQ zero, zero */
+}

diff --git a/sys/arch/octeon/octeon/autoconf.c b/sys/arch/octeon/octeon/autoconf.c
index 0adad7e..43e4960 100644 (file)
--- a/sys/arch/octeon/octeon/autoconf.c
+++ b/sys/arch/octeon/octeon/autoconf.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: autoconf.c,v 1.11 2017/06/06 14:35:53 visa Exp $      */
+/*     $OpenBSD: autoconf.c,v 1.12 2017/06/08 12:02:52 visa Exp $      */
 /*
  * Copyright (c) 2009 Miodrag Vallat.
  *
@@ -32,17 +32,6 @@ char    bootdev[16];
 enum devclass bootdev_class = DV_DULL;
 extern char uboot_rootdev[];
 
-void
-unmap_startup(void)
-{
-       extern uint32_t kernel_text[], endboot[];
-       uint32_t *word = kernel_text;
-
-       /* Cannot unmap KSEG0; smash with trap. */
-       while (word < endboot)
-               *word++ = 0x00000034u;  /* TEQ zero, zero */
-}
-
 void
 cpu_configure(void)
 {

diff --git a/sys/arch/sgi/sgi/autoconf.c b/sys/arch/sgi/sgi/autoconf.c
index 4120664..9282972 100644 (file)
--- a/sys/arch/sgi/sgi/autoconf.c
+++ b/sys/arch/sgi/sgi/autoconf.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: autoconf.c,v 1.41 2017/06/08 11:47:25 visa Exp $      */
+/*     $OpenBSD: autoconf.c,v 1.42 2017/06/08 12:02:52 visa Exp $      */
 /*
  * Copyright (c) 2009, 2010 Miodrag Vallat.
  *
@@ -129,17 +129,6 @@ int16_t    currentnasid = 0;
 char   osloadpartition[256];
 char   osloadoptions[129];
 
-void
-unmap_startup(void)
-{
-       extern uint32_t kernel_text[], endboot[];
-       uint32_t *word = kernel_text;
-
-       /* Cannot unmap kseg0 or xkphys; smash with trap. */
-       while (word < endboot)
-               *word++ = 0x00000034u;  /* TEQ zero, zero */
-}
-
 /*
  *  Configure all devices found that we know about.
  *  This is done at boot time.