Module Name: src Committed By: snj Date: Sun Jul 26 18:45:44 UTC 2009
Modified Files: src/sys/arch/pmax/pmax [netbsd-5]: machdep.c Log Message: Pull up following revision(s) (requested by tsutsui in ticket #869): 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.223 -r1.223.6.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.223 src/sys/arch/pmax/pmax/machdep.c:1.223.6.1 --- src/sys/arch/pmax/pmax/machdep.c:1.223 Wed Jul 2 17:28:56 2008 +++ src/sys/arch/pmax/pmax/machdep.c Sun Jul 26 18:45:44 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.223 2008/07/02 17:28:56 ad Exp $ */ +/* $NetBSD: machdep.c,v 1.223.6.1 2009/07/26 18:45:44 snj 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.223 2008/07/02 17:28:56 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.223.6.1 2009/07/26 18:45:44 snj Exp $"); #include "fs_mfs.h" #include "opt_ddb.h" @@ -234,13 +234,13 @@ esym = (void *)bi_syms->esym; kernend = (void *)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;