Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-7]: src/sys/arch Pull up following revision(s) (requested by tsut...
details: https://anonhg.NetBSD.org/src/rev/62d17d77ea97
branches: netbsd-7
changeset: 799735:62d17d77ea97
user: snj <snj%NetBSD.org@localhost>
date: Sat Dec 26 22:14:41 2015 +0000
description:
Pull up following revision(s) (requested by tsutsui in ticket #1051):
sys/arch/landisk/landisk/machdep.c: revision 1.18
sys/arch/sh3/sh3/sh3_machdep.c: revision 1.103
Remove \n from set_cpumodel(), and explicitly print \n during boot instead.
Fixes dmesg on NetBSD/dreamcast 7.0 (and probably NetBSD/hpcsh 7.0):
---
NetBSD 7.0 (GENERIC.201509250726Z)
SEGA Dreamcasttotal memory = 16384 KB
avail memory = 13668 KB
---
which was mangled when cpu_getmode() and cpu_setmodel() were introduced:
http://mail-index.netbsd.org/source-changes/2014/03/24/msg053273.html
diffstat:
sys/arch/landisk/landisk/machdep.c | 6 +++---
sys/arch/sh3/sh3/sh3_machdep.c | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diffs (54 lines):
diff -r 4b1d4ad4ab7a -r 62d17d77ea97 sys/arch/landisk/landisk/machdep.c
--- a/sys/arch/landisk/landisk/machdep.c Sat Dec 26 22:11:38 2015 +0000
+++ b/sys/arch/landisk/landisk/machdep.c Sat Dec 26 22:14:41 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.17 2014/03/24 20:06:32 christos Exp $ */
+/* $NetBSD: machdep.c,v 1.17.4.1 2015/12/26 22:14:41 snj Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.17 2014/03/24 20:06:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.17.4.1 2015/12/26 22:14:41 snj Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -147,7 +147,7 @@
{
/* XXX: show model (LANDISK/USL-5P) */
- cpu_setmodel("Model: I-O DATA LANDISK\n");
+ cpu_setmodel("Model: I-O DATA LANDISK");
sh_startup();
}
diff -r 4b1d4ad4ab7a -r 62d17d77ea97 sys/arch/sh3/sh3/sh3_machdep.c
--- a/sys/arch/sh3/sh3/sh3_machdep.c Sat Dec 26 22:11:38 2015 +0000
+++ b/sys/arch/sh3/sh3/sh3_machdep.c Sat Dec 26 22:14:41 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sh3_machdep.c,v 1.102 2014/03/24 20:06:32 christos Exp $ */
+/* $NetBSD: sh3_machdep.c,v 1.102.4.1 2015/12/26 22:14:41 snj Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2002 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sh3_machdep.c,v 1.102 2014/03/24 20:06:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sh3_machdep.c,v 1.102.4.1 2015/12/26 22:14:41 snj Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -277,7 +277,7 @@
printf("%s%s", copyright, version);
if (*model != '\0')
- printf("%s", model);
+ printf("%s\n", model);
#ifdef DEBUG
printf("general exception handler:\t%d byte\n",
sh_vector_generic_end - sh_vector_generic);
Home |
Main Index |
Thread Index |
Old Index