Module Name: src
Committed By: riastradh
Date: Thu Mar 3 06:28:26 UTC 2022
Modified Files:
src/sys/arch/vax/vax: autoconf.c ka6400.c ka820.c ka88.c multicpu.c
Log Message:
vax: Use device_set_private.
To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/sys/arch/vax/vax/autoconf.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/vax/vax/ka6400.c \
src/sys/arch/vax/vax/ka88.c
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/vax/vax/ka820.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/vax/vax/multicpu.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/vax/vax/autoconf.c
diff -u src/sys/arch/vax/vax/autoconf.c:1.99 src/sys/arch/vax/vax/autoconf.c:1.100
--- src/sys/arch/vax/vax/autoconf.c:1.99 Sat Aug 7 16:19:07 2021
+++ src/sys/arch/vax/vax/autoconf.c Thu Mar 3 06:28:26 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.99 2021/08/07 16:19:07 thorpej Exp $ */
+/* $NetBSD: autoconf.c,v 1.100 2022/03/03 06:28:26 riastradh Exp $ */
/*
* Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.99 2021/08/07 16:19:07 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.100 2022/03/03 06:28:26 riastradh Exp $");
#include "opt_compat_netbsd.h"
#include "opt_cputype.h"
@@ -173,7 +173,7 @@ cpu_mainbus_attach(device_t parent, devi
KASSERT(device_private(self) == NULL);
ci = curcpu();
- self->dv_private = ci;
+ device_set_private(self, ci);
ci->ci_dev = self;
ci->ci_cpuid = device_unit(self);
Index: src/sys/arch/vax/vax/ka6400.c
diff -u src/sys/arch/vax/vax/ka6400.c:1.20 src/sys/arch/vax/vax/ka6400.c:1.21
--- src/sys/arch/vax/vax/ka6400.c:1.20 Sun Dec 1 15:34:46 2019
+++ src/sys/arch/vax/vax/ka6400.c Thu Mar 3 06:28:26 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ka6400.c,v 1.20 2019/12/01 15:34:46 ad Exp $ */
+/* $NetBSD: ka6400.c,v 1.21 2022/03/03 06:28:26 riastradh Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ka6400.c,v 1.20 2019/12/01 15:34:46 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka6400.c,v 1.21 2022/03/03 06:28:26 riastradh Exp $");
#include "opt_multiprocessor.h"
@@ -146,7 +146,7 @@ ka6400_attach(device_t parent, device_t
mtpr(0, PR_VPSR); /* Can't use vector processor */
ci = curcpu();
- self->dv_private = ci;
+ device_set_private(self, ci);
ci->ci_dev = self;
ci->ci_cpuid = device_unit(self);
ci->ci_slotid = xa->xa_nodenr;
Index: src/sys/arch/vax/vax/ka88.c
diff -u src/sys/arch/vax/vax/ka88.c:1.20 src/sys/arch/vax/vax/ka88.c:1.21
--- src/sys/arch/vax/vax/ka88.c:1.20 Sun Dec 1 15:34:46 2019
+++ src/sys/arch/vax/vax/ka88.c Thu Mar 3 06:28:26 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ka88.c,v 1.20 2019/12/01 15:34:46 ad Exp $ */
+/* $NetBSD: ka88.c,v 1.21 2022/03/03 06:28:26 riastradh Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ka88.c,v 1.20 2019/12/01 15:34:46 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka88.c,v 1.21 2022/03/03 06:28:26 riastradh Exp $");
#include "opt_multiprocessor.h"
@@ -149,7 +149,7 @@ ka88_cpu_attach(device_t parent, device_
return;
}
ci = curcpu();
- self->dv_private = ci;
+ device_set_private(self, ci);
ci->ci_dev = self;
ci->ci_cpuid = device_unit(self);
ci->ci_slotid = na->na_slot;
Index: src/sys/arch/vax/vax/ka820.c
diff -u src/sys/arch/vax/vax/ka820.c:1.57 src/sys/arch/vax/vax/ka820.c:1.58
--- src/sys/arch/vax/vax/ka820.c:1.57 Sun Dec 1 15:34:46 2019
+++ src/sys/arch/vax/vax/ka820.c Thu Mar 3 06:28:26 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ka820.c,v 1.57 2019/12/01 15:34:46 ad Exp $ */
+/* $NetBSD: ka820.c,v 1.58 2022/03/03 06:28:26 riastradh Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ka820.c,v 1.57 2019/12/01 15:34:46 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka820.c,v 1.58 2022/03/03 06:28:26 riastradh Exp $");
#include "opt_multiprocessor.h"
@@ -169,8 +169,8 @@ ka820_attach(device_t parent, device_t s
#endif
ci = curcpu();
- self->dv_private = ci; /* eww. but curcpu() is already too */
- /* entrenched to change */
+ device_set_private(self, ci); /* eww. but curcpu() is already too */
+ /* entrenched to change */
ci->ci_slotid = ba->ba_nodenr;
ci->ci_cpuid = device_unit(self);
ci->ci_dev = self;
Index: src/sys/arch/vax/vax/multicpu.c
diff -u src/sys/arch/vax/vax/multicpu.c:1.36 src/sys/arch/vax/vax/multicpu.c:1.37
--- src/sys/arch/vax/vax/multicpu.c:1.36 Sat Nov 21 22:37:11 2020
+++ src/sys/arch/vax/vax/multicpu.c Thu Mar 3 06:28:26 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: multicpu.c,v 1.36 2020/11/21 22:37:11 thorpej Exp $ */
+/* $NetBSD: multicpu.c,v 1.37 2022/03/03 06:28:26 riastradh Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: multicpu.c,v 1.36 2020/11/21 22:37:11 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: multicpu.c,v 1.37 2022/03/03 06:28:26 riastradh Exp $");
#include "opt_multiprocessor.h"
@@ -87,7 +87,7 @@ cpu_slavesetup(device_t self, int slotid
KASSERT(device_private(self) == NULL);
ci = kmem_zalloc(sizeof(*ci), KM_SLEEP);
- self->dv_private = ci;
+ device_set_private(self, ci);
ci->ci_dev = self;
ci->ci_slotid = slotid;
ci->ci_cpuid = device_unit(self);
