Module Name: src
Committed By: mrg
Date: Sun Jan 17 00:18:28 UTC 2021
Modified Files:
src/sys/arch/sparc64/dev: psycho.c pyro.c schizo.c
Log Message:
reduce the scope of 'ci' variable.
To generate a diff of this commit:
cvs rdiff -u -r1.131 -r1.132 src/sys/arch/sparc64/dev/psycho.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/sparc64/dev/pyro.c
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/sparc64/dev/schizo.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/sparc64/dev/psycho.c
diff -u src/sys/arch/sparc64/dev/psycho.c:1.131 src/sys/arch/sparc64/dev/psycho.c:1.132
--- src/sys/arch/sparc64/dev/psycho.c:1.131 Thu Jan 7 07:40:39 2021
+++ src/sys/arch/sparc64/dev/psycho.c Sun Jan 17 00:18:28 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: psycho.c,v 1.131 2021/01/07 07:40:39 nakayama Exp $ */
+/* $NetBSD: psycho.c,v 1.132 2021/01/17 00:18:28 mrg Exp $ */
/*
* Copyright (c) 1999, 2000 Matthew R. Green
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: psycho.c,v 1.131 2021/01/07 07:40:39 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: psycho.c,v 1.132 2021/01/17 00:18:28 mrg Exp $");
#include "opt_ddb.h"
@@ -1382,7 +1382,6 @@ psycho_pci_conf_read(pci_chipset_tag_t p
{
struct psycho_pbm *pp = pc->cookie;
struct psycho_softc *sc = pp->pp_sc;
- struct cpu_info *ci = curcpu();
pcireg_t val = (pcireg_t)~0;
int s;
@@ -1397,6 +1396,7 @@ psycho_pci_conf_read(pci_chipset_tag_t p
(int)PCITAG_OFFSET(tag) + reg));
s = splhigh();
+ struct cpu_info *ci = curcpu();
ci->ci_pci_probe = true;
membar_Sync();
val = bus_space_read_4(sc->sc_configtag, sc->sc_configaddr,
Index: src/sys/arch/sparc64/dev/pyro.c
diff -u src/sys/arch/sparc64/dev/pyro.c:1.21 src/sys/arch/sparc64/dev/pyro.c:1.22
--- src/sys/arch/sparc64/dev/pyro.c:1.21 Mon Jan 4 14:48:51 2021
+++ src/sys/arch/sparc64/dev/pyro.c Sun Jan 17 00:18:28 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pyro.c,v 1.21 2021/01/04 14:48:51 thorpej Exp $ */
+/* $NetBSD: pyro.c,v 1.22 2021/01/17 00:18:28 mrg Exp $ */
/* from: $OpenBSD: pyro.c,v 1.20 2010/12/05 15:15:14 kettenis Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pyro.c,v 1.21 2021/01/04 14:48:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pyro.c,v 1.22 2021/01/17 00:18:28 mrg Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -283,13 +283,13 @@ pcireg_t
pyro_conf_read(pci_chipset_tag_t pc, pcitag_t tag, int reg)
{
struct pyro_pbm *pp = pc->cookie;
- struct cpu_info *ci = curcpu();
pcireg_t val = (pcireg_t)~0;
int s;
DPRINTF(PDB_CONF, ("%s: tag %lx reg %x ", __func__, (long)tag, reg));
if (PCITAG_NODE(tag) != -1 && (unsigned int)reg < PCI_CONF_SIZE) {
s = splhigh();
+ struct cpu_info *ci = curcpu();
ci->ci_pci_probe = true;
membar_Sync();
val = bus_space_read_4(pp->pp_cfgt, pp->pp_cfgh,
Index: src/sys/arch/sparc64/dev/schizo.c
diff -u src/sys/arch/sparc64/dev/schizo.c:1.42 src/sys/arch/sparc64/dev/schizo.c:1.43
--- src/sys/arch/sparc64/dev/schizo.c:1.42 Tue Oct 1 18:00:07 2019
+++ src/sys/arch/sparc64/dev/schizo.c Sun Jan 17 00:18:28 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: schizo.c,v 1.42 2019/10/01 18:00:07 chs Exp $ */
+/* $NetBSD: schizo.c,v 1.43 2021/01/17 00:18:28 mrg Exp $ */
/* $OpenBSD: schizo.c,v 1.55 2008/08/18 20:29:37 brad Exp $ */
/*
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: schizo.c,v 1.42 2019/10/01 18:00:07 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: schizo.c,v 1.43 2021/01/17 00:18:28 mrg Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -526,13 +526,13 @@ pcireg_t
schizo_conf_read(pci_chipset_tag_t pc, pcitag_t tag, int reg)
{
struct schizo_pbm *sp = pc->cookie;
- struct cpu_info *ci = curcpu();
pcireg_t val = (pcireg_t)~0;
int s;
DPRINTF(SDB_CONF, ("%s: tag %lx reg %x ", __func__, (long)tag, reg));
if (PCITAG_NODE(tag) != -1 && (unsigned int)reg < PCI_CONF_SIZE) {
s = splhigh();
+ struct cpu_info *ci = curcpu();
ci->ci_pci_probe = true;
membar_Sync();
val = bus_space_read_4(sp->sp_cfgt, sp->sp_cfgh,
