Module Name: src
Committed By: bouyer
Date: Tue Aug 18 10:21:53 UTC 2009
Modified Files:
src/sys/arch/pmax/pmax [netbsd-4]: machdep.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1348):
sys/arch/pmax/pmax/machdep.c: revision 1.233
Fix an #ifdef botch in rev 1.214 that causes
[ Kernel symbol table invalid! ] message at boot,
which means no ksyms(4) support even on GENERIC kernel.
Should be pulled up to netbsd-4 and netbsd-5.
To generate a diff of this commit:
cvs rdiff -u -r1.214 -r1.214.12.1 src/sys/arch/pmax/pmax/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/pmax/pmax/machdep.c
diff -u src/sys/arch/pmax/pmax/machdep.c:1.214 src/sys/arch/pmax/pmax/machdep.c:1.214.12.1
--- src/sys/arch/pmax/pmax/machdep.c:1.214 Sat Apr 15 17:51:34 2006
+++ src/sys/arch/pmax/pmax/machdep.c Tue Aug 18 10:21:53 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.214 2006/04/15 17:51:34 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.214.12.1 2009/08/18 10:21:53 bouyer Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.214 2006/04/15 17:51:34 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.214.12.1 2009/08/18 10:21:53 bouyer Exp $");
#include "fs_mfs.h"
#include "opt_ddb.h"
@@ -236,13 +236,13 @@
esym = (caddr_t)bi_syms->esym;
kernend = (caddr_t)mips_round_page(esym);
memset(edata, 0, end - edata);
- }
+ } else
+#ifdef EXEC_AOUT
/* XXX: Backwards compatibility with old bootblocks - this should
* go soon...
*/
-#ifdef EXEC_AOUT
/* Exec header and symbols? */
- else if (aout->a_midmag == 0x07018b00 && (i = aout->a_syms) != 0) {
+ if (aout->a_midmag == 0x07018b00 && (i = aout->a_syms) != 0) {
ssym = end;
i += (*(long *)(end + i + 4) + 3) & ~3; /* strings */
esym = end + i + 4;
