Module Name: src
Committed By: riastradh
Date: Thu Mar 3 06:27:03 UTC 2022
Modified Files:
src/sys/arch/cobalt/cobalt: cpu.c
src/sys/arch/ews4800mips/ews4800mips: cpu.c
src/sys/arch/hpcmips/hpcmips: cpu.c
src/sys/arch/mipsco/mipsco: cpu.c
src/sys/arch/newsmips/newsmips: cpu.c
src/sys/arch/pmax/pmax: cpu.c
src/sys/arch/sgimips/sgimips: cpu.c
Log Message:
mips: Use device_set_private for cpuN on older ports.
Specifically, for those that don't use cpu_attach_common of
mips_subr.c.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/cobalt/cobalt/cpu.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ews4800mips/ews4800mips/cpu.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hpcmips/hpcmips/cpu.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/mipsco/mipsco/cpu.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/newsmips/newsmips/cpu.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/pmax/pmax/cpu.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/sgimips/sgimips/cpu.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/cobalt/cobalt/cpu.c
diff -u src/sys/arch/cobalt/cobalt/cpu.c:1.11 src/sys/arch/cobalt/cobalt/cpu.c:1.12
--- src/sys/arch/cobalt/cobalt/cpu.c:1.11 Sun Feb 20 07:54:10 2011
+++ src/sys/arch/cobalt/cobalt/cpu.c Thu Mar 3 06:27:03 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.11 2011/02/20 07:54:10 matt Exp $ */
+/* $NetBSD: cpu.c,v 1.12 2022/03/03 06:27:03 riastradh Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.11 2011/02/20 07:54:10 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.12 2022/03/03 06:27:03 riastradh Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -59,7 +59,7 @@ cpu_attach(device_t parent, device_t sel
struct cpu_info * const ci = curcpu();
ci->ci_dev = self;
- self->dv_private = ci;
+ device_set_private(self, ci);
aprint_normal(": ");
cpu_identify(self);
Index: src/sys/arch/ews4800mips/ews4800mips/cpu.c
diff -u src/sys/arch/ews4800mips/ews4800mips/cpu.c:1.5 src/sys/arch/ews4800mips/ews4800mips/cpu.c:1.6
--- src/sys/arch/ews4800mips/ews4800mips/cpu.c:1.5 Tue Jun 23 21:00:23 2015
+++ src/sys/arch/ews4800mips/ews4800mips/cpu.c Thu Mar 3 06:27:03 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.5 2015/06/23 21:00:23 matt Exp $ */
+/* $NetBSD: cpu.c,v 1.6 2022/03/03 06:27:03 riastradh Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang. All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.5 2015/06/23 21:00:23 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.6 2022/03/03 06:27:03 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -66,7 +66,7 @@ cpuattach(device_t parent, device_t self
struct cpu_info * const ci = curcpu();
ci->ci_dev = self;
- self->dv_private = ci;
+ device_set_private(self, ci);
aprint_normal(": ");
cpu_attached = 1;
Index: src/sys/arch/hpcmips/hpcmips/cpu.c
diff -u src/sys/arch/hpcmips/hpcmips/cpu.c:1.18 src/sys/arch/hpcmips/hpcmips/cpu.c:1.19
--- src/sys/arch/hpcmips/hpcmips/cpu.c:1.18 Sat Feb 26 12:08:30 2011
+++ src/sys/arch/hpcmips/hpcmips/cpu.c Thu Mar 3 06:27:03 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.18 2011/02/26 12:08:30 tsutsui Exp $ */
+/* $NetBSD: cpu.c,v 1.19 2022/03/03 06:27:03 riastradh Exp $ */
/*-
* Copyright (c) 1999 Shin Takemura, All rights reserved.
* Copyright (c) 1999-2001 SATO Kazumi, All rights reserved.
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.18 2011/02/26 12:08:30 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.19 2022/03/03 06:27:03 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -93,7 +93,7 @@ cpuattach(device_t parent, device_t self
struct cpu_info * const ci = curcpu();
ci->ci_dev = self;
- self->dv_private = ci;
+ device_set_private(self, ci);
aprint_normal(": ");
Index: src/sys/arch/mipsco/mipsco/cpu.c
diff -u src/sys/arch/mipsco/mipsco/cpu.c:1.11 src/sys/arch/mipsco/mipsco/cpu.c:1.12
--- src/sys/arch/mipsco/mipsco/cpu.c:1.11 Sat Oct 27 17:18:03 2012
+++ src/sys/arch/mipsco/mipsco/cpu.c Thu Mar 3 06:27:03 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.11 2012/10/27 17:18:03 chs Exp $ */
+/* $NetBSD: cpu.c,v 1.12 2022/03/03 06:27:03 riastradh Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.11 2012/10/27 17:18:03 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.12 2022/03/03 06:27:03 riastradh Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -66,7 +66,7 @@ cpuattach(device_t parent, device_t self
struct cpu_info * const ci = curcpu();
ci->ci_dev = self;
- self->dv_private = ci;
+ device_set_private(self, ci);
aprint_normal(": ");
cpu_identify(self);
Index: src/sys/arch/newsmips/newsmips/cpu.c
diff -u src/sys/arch/newsmips/newsmips/cpu.c:1.12 src/sys/arch/newsmips/newsmips/cpu.c:1.13
--- src/sys/arch/newsmips/newsmips/cpu.c:1.12 Sun Feb 20 07:56:31 2011
+++ src/sys/arch/newsmips/newsmips/cpu.c Thu Mar 3 06:27:03 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.12 2011/02/20 07:56:31 matt Exp $ */
+/* $NetBSD: cpu.c,v 1.13 2022/03/03 06:27:03 riastradh Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.12 2011/02/20 07:56:31 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.13 2022/03/03 06:27:03 riastradh Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -66,7 +66,7 @@ cpuattach(device_t parent, device_t self
struct cpu_info * const ci = curcpu();
ci->ci_dev = self;
- self->dv_private = ci;
+ device_set_private(self, ci);
aprint_normal(": ");
cpu_identify(self);
Index: src/sys/arch/pmax/pmax/cpu.c
diff -u src/sys/arch/pmax/pmax/cpu.c:1.31 src/sys/arch/pmax/pmax/cpu.c:1.32
--- src/sys/arch/pmax/pmax/cpu.c:1.31 Sat Jul 9 17:32:30 2011
+++ src/sys/arch/pmax/pmax/cpu.c Thu Mar 3 06:27:03 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.31 2011/07/09 17:32:30 matt Exp $ */
+/* $NetBSD: cpu.c,v 1.32 2022/03/03 06:27:03 riastradh Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.31 2011/07/09 17:32:30 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.32 2022/03/03 06:27:03 riastradh Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -66,7 +66,7 @@ cpuattach(device_t parent, device_t self
struct cpu_info * const ci = curcpu();
ci->ci_dev = self;
- self->dv_private = ci;
+ device_set_private(self, ci);
aprint_normal(": ");
cpu_identify(self);
Index: src/sys/arch/sgimips/sgimips/cpu.c
diff -u src/sys/arch/sgimips/sgimips/cpu.c:1.27 src/sys/arch/sgimips/sgimips/cpu.c:1.28
--- src/sys/arch/sgimips/sgimips/cpu.c:1.27 Thu Nov 17 23:46:52 2016
+++ src/sys/arch/sgimips/sgimips/cpu.c Thu Mar 3 06:27:03 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.27 2016/11/17 23:46:52 macallan Exp $ */
+/* $NetBSD: cpu.c,v 1.28 2022/03/03 06:27:03 riastradh Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.27 2016/11/17 23:46:52 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.28 2022/03/03 06:27:03 riastradh Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -91,7 +91,7 @@ cpu_attach(device_t parent, device_t sel
struct cpu_info * const ci = curcpu();
ci->ci_dev = self;
- self->dv_private = ci;
+ device_set_private(self, ci);
aprint_normal(": ");
cpu_identify(self);
