Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/mac68k/mac68k Back out unintended changes from prev...



details:   https://anonhg.NetBSD.org/src/rev/0af850969fee
branches:  trunk
changeset: 531892:0af850969fee
user:      scottr <scottr%NetBSD.org@localhost>
date:      Tue May 28 16:53:24 2002 +0000

description:
Back out unintended changes from previous commit.

diffstat:

 sys/arch/mac68k/mac68k/machdep.c |  21 +--------------------
 1 files changed, 1 insertions(+), 20 deletions(-)

diffs (49 lines):

diff -r bbef094a5c60 -r 0af850969fee sys/arch/mac68k/mac68k/machdep.c
--- a/sys/arch/mac68k/mac68k/machdep.c  Tue May 28 16:40:03 2002 +0000
+++ b/sys/arch/mac68k/mac68k/machdep.c  Tue May 28 16:53:24 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.273 2002/05/21 07:05:31 scottr Exp $     */
+/*     $NetBSD: machdep.c,v 1.274 2002/05/28 16:53:24 scottr Exp $     */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -375,8 +375,6 @@
 void
 cpu_startup(void)
 {
-       extern char *start;
-       extern char *etext;
        caddr_t v;
        unsigned i;
        int vers;
@@ -488,19 +486,6 @@
        printf("using %d buffers containing %s of memory\n", nbuf, pbuf);
 
        /*
-        * Tell the VM system that writing to kernel text isn't allowed.
-        * If we don't, we might end up COW'ing the text segment!
-        *
-        * XXX I'd like this to be m68k_trunc_page(&kernel_text) instead
-        * XXX of the reference to &start, but we have to keep the
-        * XXX interrupt vectors and such writable for the Mac toolbox.
-        */
-       if (uvm_map_protect(kernel_map,
-           m68k_trunc_page(&start + (NBPG - 1)), m68k_round_page(&etext),
-           (UVM_PROT_READ | UVM_PROT_EXEC), TRUE) != 0)
-               panic("can't protect kernel text");
-
-       /*
         * Set up CPU-specific registers, cache, etc.
         */
        initcpu();
@@ -2043,10 +2028,6 @@
        { MACH_MACPB180,        0x60000000,     0x0ffe0000,     128 * 1024 },
        { MACH_MACPB210,        0x60000000,     0x0,            128 * 1024 },
        { MACH_MACPB230,        0x60000000,     0x0,            128 * 1024 },
-       { MACH_MACPB250,        0x60000000,     0x0,            128 * 1024 },
-       { MACH_MACPB270,        0x60000000,     0x0,            128 * 1024 },
-       { MACH_MACPB280,        0x60000000,     0x0,            128 * 1024 },
-       { MACH_MACPB280C,       0x60000000,     0x0,            128 * 1024 },
        { MACH_MACIICI,         0x0,            0x0,            320 * 1024 },
        { MACH_MACIISI,         0x0,            0x0,            320 * 1024 },
        { MACH_MACCCLASSIC,     0x50f40000,     0x0,            512 * 1024 },



Home | Main Index | Thread Index | Old Index