Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Back out unintended changes from previous commit.

This commit is contained in:
scottr 2002-05-28 16:53:24 +00:00
parent eafdf8c95d
commit be52d514c6
1 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/arch/mac68k/mac68k/machdep.c
View File

@ -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 @@ consinit(void)
void
cpu_startup(void)
{
extern char *start;
extern char *etext;
caddr_t v;
unsigned i;
int vers;
@ -487,19 +485,6 @@ cpu_startup(void)
format_bytes(pbuf, sizeof(pbuf), bufpages * NBPG);
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.
*/
@ -2043,10 +2028,6 @@ struct intvid_info_t {
{ 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 },