From owner-freebsd-sparc64@FreeBSD.ORG Mon Jan 10 13:30:25 2005 Return-Path: Delivered-To: freebsd-sparc64@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6338A16A4CF for ; Mon, 10 Jan 2005 13:30:25 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2DAED43D3F for ; Mon, 10 Jan 2005 13:30:25 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.1/8.13.1) with ESMTP id j0ADUPYh016976 for ; Mon, 10 Jan 2005 13:30:25 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.1/8.13.1/Submit) id j0ADUPWZ016975; Mon, 10 Jan 2005 13:30:25 GMT (envelope-from gnats) Resent-Date: Mon, 10 Jan 2005 13:30:25 GMT Resent-Message-Id: <200501101330.j0ADUPWZ016975@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-sparc64@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Gavin Atinson Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B343016A4CE for ; Mon, 10 Jan 2005 13:27:18 +0000 (GMT) Received: from mail-gw0.york.ac.uk (mail-gw0.york.ac.uk [144.32.128.245]) by mx1.FreeBSD.org (Postfix) with ESMTP id D9B0743D49 for ; Mon, 10 Jan 2005 13:27:17 +0000 (GMT) (envelope-from gavin@leeloo.york.ac.uk) Received: from leeloo.york.ac.uk (leeloo.york.ac.uk [144.32.226.154]) by mail-gw0.york.ac.uk (8.12.10/8.12.10) with ESMTP id j0ADRFw2012390 for ; Mon, 10 Jan 2005 13:27:15 GMT Received: from leeloo.york.ac.uk (localhost [127.0.0.1]) by leeloo.york.ac.uk (8.13.1/8.13.1) with ESMTP id j0ADaOgI087957 for ; Mon, 10 Jan 2005 13:36:24 GMT (envelope-from gavin@leeloo.york.ac.uk) Received: (from gavin@localhost) by leeloo.york.ac.uk (8.13.1/8.13.1/Submit) id j0ADaNXh087956; Mon, 10 Jan 2005 13:36:23 GMT (envelope-from gavin) Message-Id: <200501101336.j0ADaNXh087956@leeloo.york.ac.uk> Date: Mon, 10 Jan 2005 13:36:23 GMT From: Gavin Atinson To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: sparc64/76052: Incorrect panic strings in sparc64 files X-BeenThere: freebsd-sparc64@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Gavin Atinson List-Id: Porting FreeBSD to the Sparc List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jan 2005 13:30:25 -0000 >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: