Module Name: src
Committed By: christos
Date: Mon Mar 24 19:13:48 UTC 2014
Modified Files:
src/sys/arch/sbmips/sbmips: cpu.c machdep.c
Log Message:
- fix unused
- use cpu_{g,s}etmodel
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/sbmips/sbmips/cpu.c
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/sbmips/sbmips/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/sbmips/sbmips/cpu.c
diff -u src/sys/arch/sbmips/sbmips/cpu.c:1.21 src/sys/arch/sbmips/sbmips/cpu.c:1.22
--- src/sys/arch/sbmips/sbmips/cpu.c:1.21 Sat Jul 9 12:59:40 2011
+++ src/sys/arch/sbmips/sbmips/cpu.c Mon Mar 24 15:13:48 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.21 2011/07/09 16:59:40 matt Exp $ */
+/* $NetBSD: cpu.c,v 1.22 2014/03/24 19:13:48 christos Exp $ */
/*
* Copyright 2000, 2001
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.21 2011/07/09 16:59:40 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.22 2014/03/24 19:13:48 christos Exp $");
#include "opt_multiprocessor.h"
@@ -94,6 +94,7 @@ cpu_attach(device_t parent, device_t sel
/* XXX this code must run on the target CPU */
config = mips3_cp0_config_read();
+ __USE(config);
KASSERT((config & MIPS3_CONFIG_K0_MASK) == 5);
/* Determine CPU frequency */
Index: src/sys/arch/sbmips/sbmips/machdep.c
diff -u src/sys/arch/sbmips/sbmips/machdep.c:1.52 src/sys/arch/sbmips/sbmips/machdep.c:1.53
--- src/sys/arch/sbmips/sbmips/machdep.c:1.52 Sat Jul 28 19:09:50 2012
+++ src/sys/arch/sbmips/sbmips/machdep.c Mon Mar 24 15:13:48 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.52 2012/07/28 23:09:50 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.53 2014/03/24 19:13:48 christos Exp $ */
/*
* Copyright 2000, 2001
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.52 2012/07/28 23:09:50 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.53 2014/03/24 19:13:48 christos Exp $");
#include "opt_ddb.h"
#include "opt_execfmt.h"
@@ -212,7 +212,7 @@ mach_init(long fwhandle, long magic, lon
(u_int)fwhandle, (u_int)magic, (u_int)bootdata, (u_int)reserved);
#endif
- strcpy(cpu_model, "sb1250");
+ cpu_setmodel("sb1250");
if (magic == BOOTINFO_MAGIC) {
int idx;
