Date: Mon, 10 Jan 2005 13:36:23 GMT From: Gavin Atinson <gavin.atkinson@ury.york.ac.uk> To: FreeBSD-gnats-submit@FreeBSD.org Subject: sparc64/76052: Incorrect panic strings in sparc64 files Message-ID: <200501101336.j0ADaNXh087956@leeloo.york.ac.uk> Resent-Message-ID: <200501101330.j0ADUPWZ016975@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 76052
>Category: sparc64
>Synopsis: Incorrect panic strings in sparc64 files
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-sparc64
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Mon Jan 10 13:30:24 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Gavin Atinson
>Release: FreeBSD 6.0-CURRENT sparc64
>Organization:
>Environment:
System: FreeBSD leeloo.york.ac.uk 6.0-CURRENT FreeBSD 6.0-CURRENT #27: Mon Dec 27 18:23:05 GMT 2004 root@leeloo.york.ac.uk:/usr/obj/usr/src/sys/GENERIC sparc64
>Description:
A couple of the panic strings within the sparc64 MI code
are incorrect - they mention the probe function (where they may
have began life) but are now within the attach functions.
>How-To-Repeat:
Look at the code.
>Fix:
--- sparc-panics.diff begins here ---
Index: src/sys/sparc64/pci/psycho.c
===================================================================
RCS file: /usr/cvs/src/sys/sparc64/pci/psycho.c,v
retrieving revision 1.52
diff -u -r1.52 psycho.c
--- src/sys/sparc64/pci/psycho.c 12 Aug 2004 17:41:32 -0000 1.52
+++ src/sys/sparc64/pci/psycho.c 6 Jan 2005 18:18:50 -0000
@@ -405,12 +405,12 @@
sc->sc_io_rman.rm_descr = "Psycho PCI I/O Ports";
if (rman_init(&sc->sc_io_rman) != 0 ||
rman_manage_region(&sc->sc_io_rman, 0, PSYCHO_IO_SIZE) != 0)
- panic("psycho_probe: failed to set up i/o rman");
+ panic("psycho_attach: failed to set up i/o rman");
sc->sc_mem_rman.rm_type = RMAN_ARRAY;
sc->sc_mem_rman.rm_descr = "Psycho PCI Memory";
if (rman_init(&sc->sc_mem_rman) != 0 ||
rman_manage_region(&sc->sc_mem_rman, 0, PSYCHO_MEM_SIZE) != 0)
- panic("psycho_probe: failed to set up memory rman");
+ panic("psycho_attach: failed to set up memory rman");
sc->sc_nrange = OF_getprop_alloc(sc->sc_node, "ranges",
sizeof(*sc->sc_range), (void **)&sc->sc_range);
Index: src/sys/sparc64/sparc64/nexus.c
===================================================================
RCS file: /usr/cvs/src/sys/sparc64/sparc64/nexus.c,v
retrieving revision 1.15
diff -u -r1.15 nexus.c
--- src/sys/sparc64/sparc64/nexus.c 16 Aug 2004 15:45:27 -0000 1.15
+++ src/sys/sparc64/sparc64/nexus.c 6 Jan 2005 18:19:18 -0000
@@ -184,7 +184,7 @@
char *name, *type;
if ((root = OF_peer(0)) == -1)
- panic("nexus_probe: OF_peer failed.");
+ panic("nexus_attach: OF_peer failed.");
sc = device_get_softc(dev);
sc->sc_intr_rman.rm_type = RMAN_ARRAY;
--- sparc-panics.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200501101336.j0ADaNXh087956>