changeset 5037:13b3807acc31

PSARC 2007/337 OPL Jupiter CPU Support PSARC 2007/433 Integer Multiply-Add instruction set feature PSARC 2007/506 FMA for OPL Jupiter CPU 6551253 OPL Jupiter CPU support
author jl139090
date Wed, 12 Sep 2007 22:37:07 -0700
parents 4879e862fff8
children c27e9402c8fc
files usr/src/cmd/fm/dicts/SUN4U.dict usr/src/cmd/fm/dicts/SUN4U.po usr/src/cmd/fm/modules/SUNW,SPARC-Enterprise/cpumem-retire/cma_main.c usr/src/cmd/fm/modules/sun4/cpumem-diagnosis/cmd_cpu.c usr/src/cmd/fm/modules/sun4/cpumem-diagnosis/cmd_cpu.h usr/src/cmd/fm/modules/sun4/cpumem-diagnosis/cmd_cpuerr.c usr/src/cmd/fm/modules/sun4/cpumem-diagnosis/cmd_main.c usr/src/cmd/fm/modules/sun4u/cpumem-diagnosis/cmd_opl.c usr/src/cmd/fm/modules/sun4u/cpumem-diagnosis/cmd_opl.h usr/src/cmd/fm/modules/sun4u/cpumem-diagnosis/cmd_oplerr.c usr/src/common/elfcap/elfcap.c usr/src/lib/libprtdiag_psr/sparc/opl/common/opl.c usr/src/pkgdefs/SUNWcakr.u/prototype_com usr/src/pkgdefs/SUNWcpcu/prototype_sparc usr/src/uts/common/sys/auxv_SPARC.h usr/src/uts/sparc/sys/fm/cpu/SPARC64-VI.h usr/src/uts/sun4u/cpu/opl_olympus.c usr/src/uts/sun4u/cpu/opl_olympus_asm.s usr/src/uts/sun4u/io/opl_cfg.c usr/src/uts/sun4u/ngdr/io/dr_cpu.c usr/src/uts/sun4u/opl/Makefile.opl.shared usr/src/uts/sun4u/opl/io/drmach.c usr/src/uts/sun4u/opl/olympus_c/Makefile usr/src/uts/sun4u/opl/os/opl.c usr/src/uts/sun4u/opl_pcbe/Makefile usr/src/uts/sun4u/os/cmp.c usr/src/uts/sun4u/os/fillsysinfo.c usr/src/uts/sun4u/pcbe/opl_pcbe.c usr/src/uts/sun4u/sys/cpu_impl.h usr/src/uts/sun4u/sys/cpu_module.h usr/src/uts/sun4u/sys/machasi.h usr/src/uts/sun4u/sys/mmu.h usr/src/uts/sun4u/sys/opl.h usr/src/uts/sun4u/sys/opl_cfg.h usr/src/uts/sun4u/sys/sbd_ioctl.h
diffstat 35 files changed, 1137 insertions(+), 899 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/cmd/fm/dicts/SUN4U.dict	Wed Sep 12 19:25:16 2007 -0700
+++ b/usr/src/cmd/fm/dicts/SUN4U.dict	Wed Sep 12 22:37:07 2007 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # CDDL HEADER START
@@ -262,3 +262,6 @@
 fault.cpu.SPARC64-VI.core=232
 fault.cpu.SPARC64-VI.strand=233
 fault.io.pci.device-invreq fault.io.tomatillo=234
+fault.cpu.SPARC64-VII.chip=235
+fault.cpu.SPARC64-VII.core=236
+fault.cpu.SPARC64-VII.strand=237
--- a/usr/src/cmd/fm/dicts/SUN4U.po	Wed Sep 12 19:25:16 2007 -0700
+++ b/usr/src/cmd/fm/dicts/SUN4U.po	Wed Sep 12 22:37:07 2007 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # CDDL HEADER START
@@ -594,13 +594,13 @@
 msgid "SUN4U-8001-4R.severity"
 msgstr "Critical"
 msgid "SUN4U-8001-4R.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8001-4R.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8001-4R.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8001-4R.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8001-54
 # keys: defect.io.pci.driver fault.io.datapath
@@ -610,13 +610,13 @@
 msgid "SUN4U-8001-54.severity"
 msgstr "Critical"
 msgid "SUN4U-8001-54.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8001-54.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8001-54.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8001-54.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8001-6Q
 # keys: fault.io.datapath fault.io.pci.bus
@@ -626,13 +626,13 @@
 msgid "SUN4U-8001-6Q.severity"
 msgstr "Critical"
 msgid "SUN4U-8001-6Q.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8001-6Q.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8001-6Q.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8001-6Q.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8001-7C
 # keys: defect.io.pci.driver fault.io.datapath fault.io.pci.bus
@@ -642,13 +642,13 @@
 msgid "SUN4U-8001-7C.severity"
 msgstr "Critical"
 msgid "SUN4U-8001-7C.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8001-7C.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8001-7C.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8001-7C.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8001-83
 # keys: fault.io.datapath fault.io.pci.device
@@ -658,13 +658,13 @@
 msgid "SUN4U-8001-83.severity"
 msgstr "Critical"
 msgid "SUN4U-8001-83.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8001-83.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8001-83.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8001-83.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8001-9Y
 # keys: defect.io.pci.driver fault.io.datapath fault.io.pci.device
@@ -674,13 +674,13 @@
 msgid "SUN4U-8001-9Y.severity"
 msgstr "Critical"
 msgid "SUN4U-8001-9Y.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8001-9Y.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8001-9Y.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8001-9Y.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8001-AD
 # keys: fault.io.datapath fault.io.pci.bus fault.io.pci.device
@@ -690,13 +690,13 @@
 msgid "SUN4U-8001-AD.severity"
 msgstr "Critical"
 msgid "SUN4U-8001-AD.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8001-AD.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8001-AD.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8001-AD.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8001-CH
 # keys: defect.io.pci.driver fault.io.datapath fault.io.pci.bus fault.io.pci.device
@@ -706,13 +706,13 @@
 msgid "SUN4U-8001-CH.severity"
 msgstr "Critical"
 msgid "SUN4U-8001-CH.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8001-CH.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8001-CH.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8001-CH.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8001-DA
 # keys: fault.io.hbus
@@ -722,13 +722,13 @@
 msgid "SUN4U-8001-DA.severity"
 msgstr "Critical"
 msgid "SUN4U-8001-DA.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8001-DA.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8001-DA.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8001-DA.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8001-EP
 # keys: defect.io.pci.driver fault.io.hbus
@@ -738,13 +738,13 @@
 msgid "SUN4U-8001-EP.severity"
 msgstr "Critical"
 msgid "SUN4U-8001-EP.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8001-EP.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8001-EP.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8001-EP.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8001-F5
 # keys: fault.io.hbus fault.io.pci.bus
@@ -754,13 +754,13 @@
 msgid "SUN4U-8001-F5.severity"
 msgstr "Critical"
 msgid "SUN4U-8001-F5.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8001-F5.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8001-F5.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8001-F5.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8001-GS
 # keys: defect.io.pci.driver fault.io.hbus fault.io.pci.bus
@@ -770,13 +770,13 @@
 msgid "SUN4U-8001-GS.severity"
 msgstr "Critical"
 msgid "SUN4U-8001-GS.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8001-GS.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8001-GS.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8001-GS.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8001-H2
 # keys: fault.io.hbus fault.io.pci.device
@@ -786,13 +786,13 @@
 msgid "SUN4U-8001-H2.severity"
 msgstr "Critical"
 msgid "SUN4U-8001-H2.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8001-H2.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8001-H2.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8001-H2.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8001-JX
 # keys: defect.io.pci.driver fault.io.hbus fault.io.pci.device
@@ -802,13 +802,13 @@
 msgid "SUN4U-8001-JX.severity"
 msgstr "Critical"
 msgid "SUN4U-8001-JX.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8001-JX.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8001-JX.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8001-JX.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8001-KE
 # keys: fault.io.hbus fault.io.pci.bus fault.io.pci.device
@@ -818,13 +818,13 @@
 msgid "SUN4U-8001-KE.severity"
 msgstr "Critical"
 msgid "SUN4U-8001-KE.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8001-KE.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8001-KE.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8001-KE.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8001-LJ
 # keys: defect.io.pci.driver fault.io.hbus fault.io.pci.bus fault.io.pci.device
@@ -834,13 +834,13 @@
 msgid "SUN4U-8001-LJ.severity"
 msgstr "Critical"
 msgid "SUN4U-8001-LJ.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8001-LJ.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8001-LJ.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8001-LJ.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8001-MC
 # keys: fault.io.datapath fault.io.hbus
@@ -850,13 +850,13 @@
 msgid "SUN4U-8001-MC.severity"
 msgstr "Critical"
 msgid "SUN4U-8001-MC.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8001-MC.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8001-MC.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8001-MC.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8001-NQ
 # keys: defect.io.pci.driver fault.io.datapath fault.io.hbus
@@ -866,13 +866,13 @@
 msgid "SUN4U-8001-NQ.severity"
 msgstr "Critical"
 msgid "SUN4U-8001-NQ.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8001-NQ.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8001-NQ.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8001-NQ.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8001-P4
 # keys: fault.io.datapath fault.io.hbus fault.io.pci.bus
@@ -882,13 +882,13 @@
 msgid "SUN4U-8001-P4.severity"
 msgstr "Critical"
 msgid "SUN4U-8001-P4.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8001-P4.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8001-P4.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8001-P4.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8001-QR
 # keys: defect.io.pci.driver fault.io.datapath fault.io.hbus fault.io.pci.bus
@@ -898,13 +898,13 @@
 msgid "SUN4U-8001-QR.severity"
 msgstr "Critical"
 msgid "SUN4U-8001-QR.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8001-QR.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8001-QR.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8001-QR.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8001-RH
 # keys: fault.io.datapath fault.io.hbus fault.io.pci.device
@@ -914,13 +914,13 @@
 msgid "SUN4U-8001-RH.severity"
 msgstr "Critical"
 msgid "SUN4U-8001-RH.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8001-RH.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8001-RH.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8001-RH.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8001-SD
 # keys: defect.io.pci.driver fault.io.datapath fault.io.hbus fault.io.pci.device
@@ -930,13 +930,13 @@
 msgid "SUN4U-8001-SD.severity"
 msgstr "Critical"
 msgid "SUN4U-8001-SD.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8001-SD.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8001-SD.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8001-SD.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8001-TY
 # keys: fault.io.datapath fault.io.hbus fault.io.pci.bus fault.io.pci.device
@@ -946,13 +946,13 @@
 msgid "SUN4U-8001-TY.severity"
 msgstr "Critical"
 msgid "SUN4U-8001-TY.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8001-TY.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8001-TY.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8001-TY.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8001-U3
 # keys: defect.io.pci.driver fault.io.datapath fault.io.hbus fault.io.pci.bus fault.io.pci.device
@@ -962,13 +962,13 @@
 msgid "SUN4U-8001-U3.severity"
 msgstr "Critical"
 msgid "SUN4U-8001-U3.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8001-U3.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8001-U3.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8001-U3.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8001-VS
 # keys: fault.io.schizo
@@ -978,13 +978,13 @@
 msgid "SUN4U-8001-VS.severity"
 msgstr "Critical"
 msgid "SUN4U-8001-VS.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8001-VS.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8001-VS.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8001-VS.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8001-W5
 # keys: defect.io.pci.driver fault.io.schizo
@@ -994,13 +994,13 @@
 msgid "SUN4U-8001-W5.severity"
 msgstr "Critical"
 msgid "SUN4U-8001-W5.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8001-W5.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8001-W5.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8001-W5.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8001-XP
 # keys: fault.io.pci.bus fault.io.schizo
@@ -1010,13 +1010,13 @@
 msgid "SUN4U-8001-XP.severity"
 msgstr "Critical"
 msgid "SUN4U-8001-XP.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8001-XP.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8001-XP.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8001-XP.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8001-YA
 # keys: defect.io.pci.driver fault.io.pci.bus fault.io.schizo
@@ -1026,13 +1026,13 @@
 msgid "SUN4U-8001-YA.severity"
 msgstr "Critical"
 msgid "SUN4U-8001-YA.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8001-YA.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8001-YA.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8001-YA.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8002-0R
 # keys: fault.io.pci.device fault.io.schizo
@@ -1042,13 +1042,13 @@
 msgid "SUN4U-8002-0R.severity"
 msgstr "Critical"
 msgid "SUN4U-8002-0R.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8002-0R.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8002-0R.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8002-0R.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8002-14
 # keys: defect.io.pci.driver fault.io.pci.device fault.io.schizo
@@ -1058,13 +1058,13 @@
 msgid "SUN4U-8002-14.severity"
 msgstr "Critical"
 msgid "SUN4U-8002-14.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8002-14.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8002-14.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8002-14.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8002-2Q
 # keys: fault.io.pci.bus fault.io.pci.device fault.io.schizo
@@ -1074,13 +1074,13 @@
 msgid "SUN4U-8002-2Q.severity"
 msgstr "Critical"
 msgid "SUN4U-8002-2Q.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8002-2Q.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8002-2Q.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8002-2Q.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8002-3C
 # keys: defect.io.pci.driver fault.io.pci.bus fault.io.pci.device fault.io.schizo
@@ -1090,13 +1090,13 @@
 msgid "SUN4U-8002-3C.severity"
 msgstr "Critical"
 msgid "SUN4U-8002-3C.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8002-3C.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8002-3C.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8002-3C.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8002-4J
 # keys: fault.io.datapath fault.io.schizo
@@ -1106,13 +1106,13 @@
 msgid "SUN4U-8002-4J.severity"
 msgstr "Critical"
 msgid "SUN4U-8002-4J.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8002-4J.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8002-4J.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8002-4J.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8002-5E
 # keys: defect.io.pci.driver fault.io.datapath fault.io.schizo
@@ -1122,13 +1122,13 @@
 msgid "SUN4U-8002-5E.severity"
 msgstr "Critical"
 msgid "SUN4U-8002-5E.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8002-5E.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8002-5E.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8002-5E.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8002-6X
 # keys: fault.io.datapath fault.io.pci.bus fault.io.schizo
@@ -1138,13 +1138,13 @@
 msgid "SUN4U-8002-6X.severity"
 msgstr "Critical"
 msgid "SUN4U-8002-6X.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8002-6X.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8002-6X.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8002-6X.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8002-72
 # keys: defect.io.pci.driver fault.io.datapath fault.io.pci.bus fault.io.schizo
@@ -1154,13 +1154,13 @@
 msgid "SUN4U-8002-72.severity"
 msgstr "Critical"
 msgid "SUN4U-8002-72.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8002-72.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8002-72.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8002-72.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8002-8A
 # keys: fault.io.datapath fault.io.pci.device fault.io.schizo
@@ -1170,13 +1170,13 @@
 msgid "SUN4U-8002-8A.severity"
 msgstr "Critical"
 msgid "SUN4U-8002-8A.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8002-8A.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8002-8A.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8002-8A.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8002-9P
 # keys: defect.io.pci.driver fault.io.datapath fault.io.pci.device fault.io.schizo
@@ -1186,13 +1186,13 @@
 msgid "SUN4U-8002-9P.severity"
 msgstr "Critical"
 msgid "SUN4U-8002-9P.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8002-9P.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8002-9P.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8002-9P.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8002-A5
 # keys: fault.io.datapath fault.io.pci.bus fault.io.pci.device fault.io.schizo
@@ -1202,13 +1202,13 @@
 msgid "SUN4U-8002-A5.severity"
 msgstr "Critical"
 msgid "SUN4U-8002-A5.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8002-A5.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8002-A5.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8002-A5.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8002-CS
 # keys: defect.io.pci.driver fault.io.datapath fault.io.pci.bus fault.io.pci.device fault.io.schizo
@@ -1218,13 +1218,13 @@
 msgid "SUN4U-8002-CS.severity"
 msgstr "Critical"
 msgid "SUN4U-8002-CS.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8002-CS.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8002-CS.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8002-CS.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8002-D3
 # keys: fault.io.hbus fault.io.schizo
@@ -1234,13 +1234,13 @@
 msgid "SUN4U-8002-D3.severity"
 msgstr "Critical"
 msgid "SUN4U-8002-D3.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8002-D3.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8002-D3.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8002-D3.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8002-EY
 # keys: defect.io.pci.driver fault.io.hbus fault.io.schizo
@@ -1250,13 +1250,13 @@
 msgid "SUN4U-8002-EY.severity"
 msgstr "Critical"
 msgid "SUN4U-8002-EY.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8002-EY.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8002-EY.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8002-EY.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8002-FD
 # keys: fault.io.hbus fault.io.pci.bus fault.io.schizo
@@ -1266,13 +1266,13 @@
 msgid "SUN4U-8002-FD.severity"
 msgstr "Critical"
 msgid "SUN4U-8002-FD.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8002-FD.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8002-FD.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8002-FD.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8002-GH
 # keys: defect.io.pci.driver fault.io.hbus fault.io.pci.bus fault.io.schizo
@@ -1282,13 +1282,13 @@
 msgid "SUN4U-8002-GH.severity"
 msgstr "Critical"
 msgid "SUN4U-8002-GH.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8002-GH.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8002-GH.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8002-GH.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8002-HC
 # keys: fault.io.hbus fault.io.pci.device fault.io.schizo
@@ -1298,13 +1298,13 @@
 msgid "SUN4U-8002-HC.severity"
 msgstr "Critical"
 msgid "SUN4U-8002-HC.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8002-HC.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8002-HC.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8002-HC.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8002-JQ
 # keys: defect.io.pci.driver fault.io.hbus fault.io.pci.device fault.io.schizo
@@ -1314,13 +1314,13 @@
 msgid "SUN4U-8002-JQ.severity"
 msgstr "Critical"
 msgid "SUN4U-8002-JQ.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8002-JQ.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8002-JQ.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8002-JQ.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8002-K4
 # keys: fault.io.hbus fault.io.pci.bus fault.io.pci.device fault.io.schizo
@@ -1330,13 +1330,13 @@
 msgid "SUN4U-8002-K4.severity"
 msgstr "Critical"
 msgid "SUN4U-8002-K4.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8002-K4.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8002-K4.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8002-K4.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8002-LR
 # keys: defect.io.pci.driver fault.io.hbus fault.io.pci.bus fault.io.pci.device fault.io.schizo
@@ -1346,13 +1346,13 @@
 msgid "SUN4U-8002-LR.severity"
 msgstr "Critical"
 msgid "SUN4U-8002-LR.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8002-LR.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8002-LR.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8002-LR.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8002-M2
 # keys: fault.io.datapath fault.io.hbus fault.io.schizo
@@ -1362,13 +1362,13 @@
 msgid "SUN4U-8002-M2.severity"
 msgstr "Critical"
 msgid "SUN4U-8002-M2.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8002-M2.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8002-M2.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8002-M2.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8002-NX
 # keys: defect.io.pci.driver fault.io.datapath fault.io.hbus fault.io.schizo
@@ -1378,13 +1378,13 @@
 msgid "SUN4U-8002-NX.severity"
 msgstr "Critical"
 msgid "SUN4U-8002-NX.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8002-NX.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8002-NX.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8002-NX.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8002-PE
 # keys: fault.io.datapath fault.io.hbus fault.io.pci.bus fault.io.schizo
@@ -1394,13 +1394,13 @@
 msgid "SUN4U-8002-PE.severity"
 msgstr "Critical"
 msgid "SUN4U-8002-PE.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8002-PE.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8002-PE.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8002-PE.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8002-QJ
 # keys: defect.io.pci.driver fault.io.datapath fault.io.hbus fault.io.pci.bus fault.io.schizo
@@ -1410,13 +1410,13 @@
 msgid "SUN4U-8002-QJ.severity"
 msgstr "Critical"
 msgid "SUN4U-8002-QJ.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8002-QJ.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8002-QJ.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8002-QJ.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8002-RS
 # keys: fault.io.datapath fault.io.hbus fault.io.pci.device fault.io.schizo
@@ -1426,13 +1426,13 @@
 msgid "SUN4U-8002-RS.severity"
 msgstr "Critical"
 msgid "SUN4U-8002-RS.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8002-RS.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8002-RS.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8002-RS.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8002-S5
 # keys: defect.io.pci.driver fault.io.datapath fault.io.hbus fault.io.pci.device fault.io.schizo
@@ -1442,13 +1442,13 @@
 msgid "SUN4U-8002-S5.severity"
 msgstr "Critical"
 msgid "SUN4U-8002-S5.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8002-S5.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8002-S5.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8002-S5.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8002-TP
 # keys: fault.io.datapath fault.io.hbus fault.io.pci.bus fault.io.pci.device fault.io.schizo
@@ -1458,13 +1458,13 @@
 msgid "SUN4U-8002-TP.severity"
 msgstr "Critical"
 msgid "SUN4U-8002-TP.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8002-TP.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8002-TP.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8002-TP.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8002-UA
 # keys: defect.io.pci.driver fault.io.datapath fault.io.hbus fault.io.pci.bus fault.io.pci.device fault.io.schizo
@@ -1474,13 +1474,13 @@
 msgid "SUN4U-8002-UA.severity"
 msgstr "Critical"
 msgid "SUN4U-8002-UA.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8002-UA.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8002-UA.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8002-UA.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8002-VH
 # keys: fault.io.xmits
@@ -1490,13 +1490,13 @@
 msgid "SUN4U-8002-VH.severity"
 msgstr "Critical"
 msgid "SUN4U-8002-VH.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8002-VH.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8002-VH.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8002-VH.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8002-WD
 # keys: defect.io.pci.driver fault.io.xmits
@@ -1506,13 +1506,13 @@
 msgid "SUN4U-8002-WD.severity"
 msgstr "Critical"
 msgid "SUN4U-8002-WD.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8002-WD.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8002-WD.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8002-WD.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8002-XY
 # keys: fault.io.pci.bus fault.io.xmits
@@ -1522,13 +1522,13 @@
 msgid "SUN4U-8002-XY.severity"
 msgstr "Critical"
 msgid "SUN4U-8002-XY.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8002-XY.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8002-XY.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8002-XY.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8002-Y3
 # keys: defect.io.pci.driver fault.io.pci.bus fault.io.xmits
@@ -1538,13 +1538,13 @@
 msgid "SUN4U-8002-Y3.severity"
 msgstr "Critical"
 msgid "SUN4U-8002-Y3.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8002-Y3.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8002-Y3.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8002-Y3.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8003-0Y
 # keys: fault.io.pci.device fault.io.xmits
@@ -1554,13 +1554,13 @@
 msgid "SUN4U-8003-0Y.severity"
 msgstr "Critical"
 msgid "SUN4U-8003-0Y.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8003-0Y.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8003-0Y.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8003-0Y.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8003-13
 # keys: defect.io.pci.driver fault.io.pci.device fault.io.xmits
@@ -1570,13 +1570,13 @@
 msgid "SUN4U-8003-13.severity"
 msgstr "Critical"
 msgid "SUN4U-8003-13.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8003-13.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8003-13.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8003-13.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8003-2H
 # keys: fault.io.pci.bus fault.io.pci.device fault.io.xmits
@@ -1586,13 +1586,13 @@
 msgid "SUN4U-8003-2H.severity"
 msgstr "Critical"
 msgid "SUN4U-8003-2H.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8003-2H.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8003-2H.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8003-2H.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8003-3D
 # keys: defect.io.pci.driver fault.io.pci.bus fault.io.pci.device fault.io.xmits
@@ -1602,13 +1602,13 @@
 msgid "SUN4U-8003-3D.severity"
 msgstr "Critical"
 msgid "SUN4U-8003-3D.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8003-3D.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8003-3D.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8003-3D.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8003-4P
 # keys: fault.io.datapath fault.io.xmits
@@ -1618,13 +1618,13 @@
 msgid "SUN4U-8003-4P.severity"
 msgstr "Critical"
 msgid "SUN4U-8003-4P.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8003-4P.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8003-4P.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8003-4P.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8003-5A
 # keys: defect.io.pci.driver fault.io.datapath fault.io.xmits
@@ -1634,13 +1634,13 @@
 msgid "SUN4U-8003-5A.severity"
 msgstr "Critical"
 msgid "SUN4U-8003-5A.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8003-5A.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8003-5A.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8003-5A.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8003-6S
 # keys: fault.io.datapath fault.io.pci.bus fault.io.xmits
@@ -1650,13 +1650,13 @@
 msgid "SUN4U-8003-6S.severity"
 msgstr "Critical"
 msgid "SUN4U-8003-6S.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8003-6S.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8003-6S.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8003-6S.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8003-75
 # keys: defect.io.pci.driver fault.io.datapath fault.io.pci.bus fault.io.xmits
@@ -1666,13 +1666,13 @@
 msgid "SUN4U-8003-75.severity"
 msgstr "Critical"
 msgid "SUN4U-8003-75.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8003-75.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8003-75.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8003-75.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8003-8E
 # keys: fault.io.datapath fault.io.pci.device fault.io.xmits
@@ -1682,13 +1682,13 @@
 msgid "SUN4U-8003-8E.severity"
 msgstr "Critical"
 msgid "SUN4U-8003-8E.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8003-8E.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8003-8E.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8003-8E.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8003-9J
 # keys: defect.io.pci.driver fault.io.datapath fault.io.pci.device fault.io.xmits
@@ -1698,13 +1698,13 @@
 msgid "SUN4U-8003-9J.severity"
 msgstr "Critical"
 msgid "SUN4U-8003-9J.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8003-9J.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8003-9J.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8003-9J.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8003-A2
 # keys: fault.io.datapath fault.io.pci.bus fault.io.pci.device fault.io.xmits
@@ -1714,13 +1714,13 @@
 msgid "SUN4U-8003-A2.severity"
 msgstr "Critical"
 msgid "SUN4U-8003-A2.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8003-A2.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8003-A2.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8003-A2.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8003-CX
 # keys: defect.io.pci.driver fault.io.datapath fault.io.pci.bus fault.io.pci.device fault.io.xmits
@@ -1730,13 +1730,13 @@
 msgid "SUN4U-8003-CX.severity"
 msgstr "Critical"
 msgid "SUN4U-8003-CX.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8003-CX.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8003-CX.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8003-CX.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8003-D4
 # keys: fault.io.hbus fault.io.xmits
@@ -1746,13 +1746,13 @@
 msgid "SUN4U-8003-D4.severity"
 msgstr "Critical"
 msgid "SUN4U-8003-D4.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8003-D4.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8003-D4.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8003-D4.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8003-ER
 # keys: defect.io.pci.driver fault.io.hbus fault.io.xmits
@@ -1762,13 +1762,13 @@
 msgid "SUN4U-8003-ER.severity"
 msgstr "Critical"
 msgid "SUN4U-8003-ER.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8003-ER.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8003-ER.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8003-ER.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8003-FC
 # keys: fault.io.hbus fault.io.pci.bus fault.io.xmits
@@ -1778,13 +1778,13 @@
 msgid "SUN4U-8003-FC.severity"
 msgstr "Critical"
 msgid "SUN4U-8003-FC.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8003-FC.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8003-FC.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8003-FC.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8003-GQ
 # keys: defect.io.pci.driver fault.io.hbus fault.io.pci.bus fault.io.xmits
@@ -1794,13 +1794,13 @@
 msgid "SUN4U-8003-GQ.severity"
 msgstr "Critical"
 msgid "SUN4U-8003-GQ.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8003-GQ.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8003-GQ.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8003-GQ.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8003-HD
 # keys: fault.io.hbus fault.io.pci.device fault.io.xmits
@@ -1810,13 +1810,13 @@
 msgid "SUN4U-8003-HD.severity"
 msgstr "Critical"
 msgid "SUN4U-8003-HD.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8003-HD.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8003-HD.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8003-HD.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8003-JH
 # keys: defect.io.pci.driver fault.io.hbus fault.io.pci.device fault.io.xmits
@@ -1826,13 +1826,13 @@
 msgid "SUN4U-8003-JH.severity"
 msgstr "Critical"
 msgid "SUN4U-8003-JH.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8003-JH.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8003-JH.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8003-JH.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8003-K3
 # keys: fault.io.hbus fault.io.pci.bus fault.io.pci.device fault.io.xmits
@@ -1842,13 +1842,13 @@
 msgid "SUN4U-8003-K3.severity"
 msgstr "Critical"
 msgid "SUN4U-8003-K3.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8003-K3.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8003-K3.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8003-K3.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8003-LY
 # keys: defect.io.pci.driver fault.io.hbus fault.io.pci.bus fault.io.pci.device fault.io.xmits
@@ -1858,13 +1858,13 @@
 msgid "SUN4U-8003-LY.severity"
 msgstr "Critical"
 msgid "SUN4U-8003-LY.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8003-LY.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8003-LY.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8003-LY.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8003-M5
 # keys: fault.io.datapath fault.io.hbus fault.io.xmits
@@ -1874,13 +1874,13 @@
 msgid "SUN4U-8003-M5.severity"
 msgstr "Critical"
 msgid "SUN4U-8003-M5.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8003-M5.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8003-M5.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8003-M5.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8003-NS
 # keys: defect.io.pci.driver fault.io.datapath fault.io.hbus fault.io.xmits
@@ -1890,13 +1890,13 @@
 msgid "SUN4U-8003-NS.severity"
 msgstr "Critical"
 msgid "SUN4U-8003-NS.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8003-NS.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8003-NS.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8003-NS.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8003-PA
 # keys: fault.io.datapath fault.io.hbus fault.io.pci.bus fault.io.xmits
@@ -1906,13 +1906,13 @@
 msgid "SUN4U-8003-PA.severity"
 msgstr "Critical"
 msgid "SUN4U-8003-PA.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8003-PA.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8003-PA.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8003-PA.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8003-QP
 # keys: defect.io.pci.driver fault.io.datapath fault.io.hbus fault.io.pci.bus fault.io.xmits
@@ -1922,13 +1922,13 @@
 msgid "SUN4U-8003-QP.severity"
 msgstr "Critical"
 msgid "SUN4U-8003-QP.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8003-QP.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8003-QP.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8003-QP.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8003-RX
 # keys: fault.io.datapath fault.io.hbus fault.io.pci.device fault.io.xmits
@@ -1938,13 +1938,13 @@
 msgid "SUN4U-8003-RX.severity"
 msgstr "Critical"
 msgid "SUN4U-8003-RX.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8003-RX.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8003-RX.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8003-RX.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8003-S2
 # keys: defect.io.pci.driver fault.io.datapath fault.io.hbus fault.io.pci.device fault.io.xmits
@@ -1954,13 +1954,13 @@
 msgid "SUN4U-8003-S2.severity"
 msgstr "Critical"
 msgid "SUN4U-8003-S2.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8003-S2.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8003-S2.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8003-S2.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8003-TJ
 # keys: fault.io.datapath fault.io.hbus fault.io.pci.bus fault.io.pci.device fault.io.xmits
@@ -1970,13 +1970,13 @@
 msgid "SUN4U-8003-TJ.severity"
 msgstr "Critical"
 msgid "SUN4U-8003-TJ.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8003-TJ.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8003-TJ.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8003-TJ.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8003-UE
 # keys: defect.io.pci.driver fault.io.datapath fault.io.hbus fault.io.pci.bus fault.io.pci.device fault.io.xmits
@@ -1986,13 +1986,13 @@
 msgid "SUN4U-8003-UE.severity"
 msgstr "Critical"
 msgid "SUN4U-8003-UE.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8003-UE.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8003-UE.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8003-UE.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8003-VQ
 # keys: fault.io.schizo fault.io.xmits
@@ -2002,13 +2002,13 @@
 msgid "SUN4U-8003-VQ.severity"
 msgstr "Critical"
 msgid "SUN4U-8003-VQ.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8003-VQ.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8003-VQ.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8003-VQ.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8003-WC
 # keys: defect.io.pci.driver fault.io.schizo fault.io.xmits
@@ -2018,13 +2018,13 @@
 msgid "SUN4U-8003-WC.severity"
 msgstr "Critical"
 msgid "SUN4U-8003-WC.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8003-WC.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8003-WC.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8003-WC.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8003-XR
 # keys: fault.io.pci.bus fault.io.schizo fault.io.xmits
@@ -2034,13 +2034,13 @@
 msgid "SUN4U-8003-XR.severity"
 msgstr "Critical"
 msgid "SUN4U-8003-XR.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8003-XR.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8003-XR.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8003-XR.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8003-Y4
 # keys: defect.io.pci.driver fault.io.pci.bus fault.io.schizo fault.io.xmits
@@ -2050,13 +2050,13 @@
 msgid "SUN4U-8003-Y4.severity"
 msgstr "Critical"
 msgid "SUN4U-8003-Y4.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8003-Y4.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8003-Y4.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8003-Y4.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8004-0A
 # keys: fault.io.pci.device fault.io.schizo fault.io.xmits
@@ -2066,13 +2066,13 @@
 msgid "SUN4U-8004-0A.severity"
 msgstr "Critical"
 msgid "SUN4U-8004-0A.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8004-0A.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8004-0A.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8004-0A.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8004-1P
 # keys: defect.io.pci.driver fault.io.pci.device fault.io.schizo fault.io.xmits
@@ -2082,13 +2082,13 @@
 msgid "SUN4U-8004-1P.severity"
 msgstr "Critical"
 msgid "SUN4U-8004-1P.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8004-1P.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8004-1P.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8004-1P.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8004-25
 # keys: fault.io.pci.bus fault.io.pci.device fault.io.schizo fault.io.xmits
@@ -2098,13 +2098,13 @@
 msgid "SUN4U-8004-25.severity"
 msgstr "Critical"
 msgid "SUN4U-8004-25.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8004-25.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8004-25.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8004-25.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8004-3S
 # keys: defect.io.pci.driver fault.io.pci.bus fault.io.pci.device fault.io.schizo fault.io.xmits
@@ -2114,13 +2114,13 @@
 msgid "SUN4U-8004-3S.severity"
 msgstr "Critical"
 msgid "SUN4U-8004-3S.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8004-3S.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8004-3S.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8004-3S.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8004-43
 # keys: fault.io.datapath fault.io.schizo fault.io.xmits
@@ -2130,13 +2130,13 @@
 msgid "SUN4U-8004-43.severity"
 msgstr "Critical"
 msgid "SUN4U-8004-43.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8004-43.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8004-43.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8004-43.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8004-5Y
 # keys: defect.io.pci.driver fault.io.datapath fault.io.schizo fault.io.xmits
@@ -2146,13 +2146,13 @@
 msgid "SUN4U-8004-5Y.severity"
 msgstr "Critical"
 msgid "SUN4U-8004-5Y.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8004-5Y.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8004-5Y.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8004-5Y.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8004-6D
 # keys: fault.io.datapath fault.io.pci.bus fault.io.schizo fault.io.xmits
@@ -2162,13 +2162,13 @@
 msgid "SUN4U-8004-6D.severity"
 msgstr "Critical"
 msgid "SUN4U-8004-6D.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8004-6D.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8004-6D.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8004-6D.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8004-7H
 # keys: defect.io.pci.driver fault.io.datapath fault.io.pci.bus fault.io.schizo fault.io.xmits
@@ -2178,13 +2178,13 @@
 msgid "SUN4U-8004-7H.severity"
 msgstr "Critical"
 msgid "SUN4U-8004-7H.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8004-7H.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8004-7H.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8004-7H.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8004-8R
 # keys: fault.io.datapath fault.io.pci.device fault.io.schizo fault.io.xmits
@@ -2194,13 +2194,13 @@
 msgid "SUN4U-8004-8R.severity"
 msgstr "Critical"
 msgid "SUN4U-8004-8R.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8004-8R.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8004-8R.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8004-8R.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8004-94
 # keys: defect.io.pci.driver fault.io.datapath fault.io.pci.device fault.io.schizo fault.io.xmits
@@ -2210,13 +2210,13 @@
 msgid "SUN4U-8004-94.severity"
 msgstr "Critical"
 msgid "SUN4U-8004-94.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8004-94.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8004-94.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8004-94.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8004-AQ
 # keys: fault.io.datapath fault.io.pci.bus fault.io.pci.device fault.io.schizo fault.io.xmits
@@ -2226,13 +2226,13 @@
 msgid "SUN4U-8004-AQ.severity"
 msgstr "Critical"
 msgid "SUN4U-8004-AQ.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8004-AQ.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8004-AQ.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8004-AQ.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8004-CC
 # keys: defect.io.pci.driver fault.io.datapath fault.io.pci.bus fault.io.pci.device fault.io.schizo fault.io.xmits
@@ -2242,13 +2242,13 @@
 msgid "SUN4U-8004-CC.severity"
 msgstr "Critical"
 msgid "SUN4U-8004-CC.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8004-CC.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8004-CC.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8004-CC.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8004-DJ
 # keys: fault.io.hbus fault.io.schizo fault.io.xmits
@@ -2258,13 +2258,13 @@
 msgid "SUN4U-8004-DJ.severity"
 msgstr "Critical"
 msgid "SUN4U-8004-DJ.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8004-DJ.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8004-DJ.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8004-DJ.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8004-EE
 # keys: defect.io.pci.driver fault.io.hbus fault.io.schizo fault.io.xmits
@@ -2274,13 +2274,13 @@
 msgid "SUN4U-8004-EE.severity"
 msgstr "Critical"
 msgid "SUN4U-8004-EE.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8004-EE.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8004-EE.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8004-EE.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8004-FX
 # keys: fault.io.hbus fault.io.pci.bus fault.io.schizo fault.io.xmits
@@ -2290,13 +2290,13 @@
 msgid "SUN4U-8004-FX.severity"
 msgstr "Critical"
 msgid "SUN4U-8004-FX.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8004-FX.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8004-FX.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8004-FX.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8004-G2
 # keys: defect.io.pci.driver fault.io.hbus fault.io.pci.bus fault.io.schizo fault.io.xmits
@@ -2306,13 +2306,13 @@
 msgid "SUN4U-8004-G2.severity"
 msgstr "Critical"
 msgid "SUN4U-8004-G2.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8004-G2.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8004-G2.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8004-G2.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8004-HS
 # keys: fault.io.hbus fault.io.pci.device fault.io.schizo fault.io.xmits
@@ -2322,13 +2322,13 @@
 msgid "SUN4U-8004-HS.severity"
 msgstr "Critical"
 msgid "SUN4U-8004-HS.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8004-HS.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8004-HS.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8004-HS.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8004-J5
 # keys: defect.io.pci.driver fault.io.hbus fault.io.pci.device fault.io.schizo fault.io.xmits
@@ -2338,13 +2338,13 @@
 msgid "SUN4U-8004-J5.severity"
 msgstr "Critical"
 msgid "SUN4U-8004-J5.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8004-J5.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8004-J5.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8004-J5.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8004-KP
 # keys: fault.io.hbus fault.io.pci.bus fault.io.pci.device fault.io.schizo fault.io.xmits
@@ -2354,13 +2354,13 @@
 msgid "SUN4U-8004-KP.severity"
 msgstr "Critical"
 msgid "SUN4U-8004-KP.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8004-KP.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8004-KP.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8004-KP.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8004-LA
 # keys: defect.io.pci.driver fault.io.hbus fault.io.pci.bus fault.io.pci.device fault.io.schizo fault.io.xmits
@@ -2370,13 +2370,13 @@
 msgid "SUN4U-8004-LA.severity"
 msgstr "Critical"
 msgid "SUN4U-8004-LA.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8004-LA.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8004-LA.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8004-LA.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8004-MH
 # keys: fault.io.datapath fault.io.hbus fault.io.schizo fault.io.xmits
@@ -2386,13 +2386,13 @@
 msgid "SUN4U-8004-MH.severity"
 msgstr "Critical"
 msgid "SUN4U-8004-MH.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8004-MH.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8004-MH.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8004-MH.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8004-ND
 # keys: defect.io.pci.driver fault.io.datapath fault.io.hbus fault.io.schizo fault.io.xmits
@@ -2402,13 +2402,13 @@
 msgid "SUN4U-8004-ND.severity"
 msgstr "Critical"
 msgid "SUN4U-8004-ND.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8004-ND.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8004-ND.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8004-ND.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8004-PY
 # keys: fault.io.datapath fault.io.hbus fault.io.pci.bus fault.io.schizo fault.io.xmits
@@ -2418,13 +2418,13 @@
 msgid "SUN4U-8004-PY.severity"
 msgstr "Critical"
 msgid "SUN4U-8004-PY.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8004-PY.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8004-PY.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8004-PY.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8004-Q3
 # keys: defect.io.pci.driver fault.io.datapath fault.io.hbus fault.io.pci.bus fault.io.schizo fault.io.xmits
@@ -2434,13 +2434,13 @@
 msgid "SUN4U-8004-Q3.severity"
 msgstr "Critical"
 msgid "SUN4U-8004-Q3.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8004-Q3.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8004-Q3.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8004-Q3.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8004-RC
 # keys: fault.io.datapath fault.io.hbus fault.io.pci.device fault.io.schizo fault.io.xmits
@@ -2450,13 +2450,13 @@
 msgid "SUN4U-8004-RC.severity"
 msgstr "Critical"
 msgid "SUN4U-8004-RC.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8004-RC.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8004-RC.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8004-RC.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8004-SQ
 # keys: defect.io.pci.driver fault.io.datapath fault.io.hbus fault.io.pci.device fault.io.schizo fault.io.xmits
@@ -2466,13 +2466,13 @@
 msgid "SUN4U-8004-SQ.severity"
 msgstr "Critical"
 msgid "SUN4U-8004-SQ.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8004-SQ.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8004-SQ.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8004-SQ.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8004-T4
 # keys: fault.io.datapath fault.io.hbus fault.io.pci.bus fault.io.pci.device fault.io.schizo fault.io.xmits
@@ -2482,13 +2482,13 @@
 msgid "SUN4U-8004-T4.severity"
 msgstr "Critical"
 msgid "SUN4U-8004-T4.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8004-T4.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8004-T4.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8004-T4.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8004-UR
 # keys: defect.io.pci.driver fault.io.datapath fault.io.hbus fault.io.pci.bus fault.io.pci.device fault.io.schizo fault.io.xmits
@@ -2498,13 +2498,13 @@
 msgid "SUN4U-8004-UR.severity"
 msgstr "Critical"
 msgid "SUN4U-8004-UR.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8004-UR.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8004-UR.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8004-UR.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8004-V2
 # keys: fault.io.psycho
@@ -2514,13 +2514,13 @@
 msgid "SUN4U-8004-V2.severity"
 msgstr "Critical"
 msgid "SUN4U-8004-V2.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8004-V2.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8004-V2.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8004-V2.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8004-WX
 # keys: defect.io.pci.driver fault.io.psycho
@@ -2530,13 +2530,13 @@
 msgid "SUN4U-8004-WX.severity"
 msgstr "Critical"
 msgid "SUN4U-8004-WX.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8004-WX.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8004-WX.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8004-WX.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8004-XE
 # keys: fault.io.datapath fault.io.psycho
@@ -2546,13 +2546,13 @@
 msgid "SUN4U-8004-XE.severity"
 msgstr "Critical"
 msgid "SUN4U-8004-XE.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8004-XE.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8004-XE.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8004-XE.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8004-YJ
 # keys: defect.io.pci.driver fault.io.datapath fault.io.psycho
@@ -2562,13 +2562,13 @@
 msgid "SUN4U-8004-YJ.severity"
 msgstr "Critical"
 msgid "SUN4U-8004-YJ.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8004-YJ.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8004-YJ.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8004-YJ.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8005-0E
 # keys: fault.io.hbus fault.io.psycho
@@ -2578,13 +2578,13 @@
 msgid "SUN4U-8005-0E.severity"
 msgstr "Critical"
 msgid "SUN4U-8005-0E.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8005-0E.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8005-0E.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8005-0E.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8005-1J
 # keys: defect.io.pci.driver fault.io.hbus fault.io.psycho
@@ -2594,13 +2594,13 @@
 msgid "SUN4U-8005-1J.severity"
 msgstr "Critical"
 msgid "SUN4U-8005-1J.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8005-1J.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8005-1J.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8005-1J.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8005-22
 # keys: fault.io.datapath fault.io.hbus fault.io.psycho
@@ -2610,13 +2610,13 @@
 msgid "SUN4U-8005-22.severity"
 msgstr "Critical"
 msgid "SUN4U-8005-22.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8005-22.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8005-22.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8005-22.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8005-3X
 # keys: defect.io.pci.driver fault.io.datapath fault.io.hbus fault.io.psycho
@@ -2626,13 +2626,13 @@
 msgid "SUN4U-8005-3X.severity"
 msgstr "Critical"
 msgid "SUN4U-8005-3X.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8005-3X.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8005-3X.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8005-3X.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8005-44
 # keys: fault.io.pci.bus fault.io.psycho
@@ -2642,13 +2642,13 @@
 msgid "SUN4U-8005-44.severity"
 msgstr "Critical"
 msgid "SUN4U-8005-44.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8005-44.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8005-44.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8005-44.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8005-5R
 # keys: defect.io.pci.driver fault.io.pci.bus fault.io.psycho
@@ -2658,13 +2658,13 @@
 msgid "SUN4U-8005-5R.severity"
 msgstr "Critical"
 msgid "SUN4U-8005-5R.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8005-5R.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8005-5R.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8005-5R.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8005-6C
 # keys: fault.io.datapath fault.io.pci.bus fault.io.psycho
@@ -2674,13 +2674,13 @@
 msgid "SUN4U-8005-6C.severity"
 msgstr "Critical"
 msgid "SUN4U-8005-6C.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8005-6C.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8005-6C.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8005-6C.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8005-7Q
 # keys: defect.io.pci.driver fault.io.datapath fault.io.pci.bus fault.io.psycho
@@ -2690,13 +2690,13 @@
 msgid "SUN4U-8005-7Q.severity"
 msgstr "Critical"
 msgid "SUN4U-8005-7Q.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8005-7Q.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8005-7Q.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8005-7Q.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8005-8Y
 # keys: fault.io.hbus fault.io.pci.bus fault.io.psycho
@@ -2706,13 +2706,13 @@
 msgid "SUN4U-8005-8Y.severity"
 msgstr "Critical"
 msgid "SUN4U-8005-8Y.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8005-8Y.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8005-8Y.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8005-8Y.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8005-93
 # keys: defect.io.pci.driver fault.io.hbus fault.io.pci.bus fault.io.psycho
@@ -2722,13 +2722,13 @@
 msgid "SUN4U-8005-93.severity"
 msgstr "Critical"
 msgid "SUN4U-8005-93.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8005-93.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8005-93.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8005-93.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8005-AH
 # keys: fault.io.datapath fault.io.hbus fault.io.pci.bus fault.io.psycho
@@ -2738,13 +2738,13 @@
 msgid "SUN4U-8005-AH.severity"
 msgstr "Critical"
 msgid "SUN4U-8005-AH.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8005-AH.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8005-AH.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8005-AH.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8005-CD
 # keys: defect.io.pci.driver fault.io.datapath fault.io.hbus fault.io.pci.bus fault.io.psycho
@@ -2754,13 +2754,13 @@
 msgid "SUN4U-8005-CD.severity"
 msgstr "Critical"
 msgid "SUN4U-8005-CD.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8005-CD.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8005-CD.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8005-CD.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8005-DP
 # keys: fault.io.pci.device fault.io.psycho
@@ -2770,13 +2770,13 @@
 msgid "SUN4U-8005-DP.severity"
 msgstr "Critical"
 msgid "SUN4U-8005-DP.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8005-DP.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8005-DP.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8005-DP.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8005-EA
 # keys: defect.io.pci.driver fault.io.pci.device fault.io.psycho
@@ -2786,13 +2786,13 @@
 msgid "SUN4U-8005-EA.severity"
 msgstr "Critical"
 msgid "SUN4U-8005-EA.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8005-EA.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8005-EA.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8005-EA.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8005-FS
 # keys: fault.io.datapath fault.io.pci.device fault.io.psycho
@@ -2802,13 +2802,13 @@
 msgid "SUN4U-8005-FS.severity"
 msgstr "Critical"
 msgid "SUN4U-8005-FS.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8005-FS.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8005-FS.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8005-FS.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8005-G5
 # keys: defect.io.pci.driver fault.io.datapath fault.io.pci.device fault.io.psycho
@@ -2818,13 +2818,13 @@
 msgid "SUN4U-8005-G5.severity"
 msgstr "Critical"
 msgid "SUN4U-8005-G5.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8005-G5.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8005-G5.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8005-G5.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8005-HX
 # keys: fault.io.hbus fault.io.pci.device fault.io.psycho
@@ -2834,13 +2834,13 @@
 msgid "SUN4U-8005-HX.severity"
 msgstr "Critical"
 msgid "SUN4U-8005-HX.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8005-HX.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8005-HX.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8005-HX.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8005-J2
 # keys: defect.io.pci.driver fault.io.hbus fault.io.pci.device fault.io.psycho
@@ -2850,13 +2850,13 @@
 msgid "SUN4U-8005-J2.severity"
 msgstr "Critical"
 msgid "SUN4U-8005-J2.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8005-J2.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8005-J2.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8005-J2.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8005-KJ
 # keys: fault.io.datapath fault.io.hbus fault.io.pci.device fault.io.psycho
@@ -2866,13 +2866,13 @@
 msgid "SUN4U-8005-KJ.severity"
 msgstr "Critical"
 msgid "SUN4U-8005-KJ.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8005-KJ.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8005-KJ.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8005-KJ.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8005-LE
 # keys: defect.io.pci.driver fault.io.datapath fault.io.hbus fault.io.pci.device fault.io.psycho
@@ -2882,13 +2882,13 @@
 msgid "SUN4U-8005-LE.severity"
 msgstr "Critical"
 msgid "SUN4U-8005-LE.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8005-LE.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8005-LE.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8005-LE.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8005-MQ
 # keys: fault.io.pci.bus fault.io.pci.device fault.io.psycho
@@ -2898,13 +2898,13 @@
 msgid "SUN4U-8005-MQ.severity"
 msgstr "Critical"
 msgid "SUN4U-8005-MQ.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8005-MQ.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8005-MQ.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8005-MQ.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8005-NC
 # keys: defect.io.pci.driver fault.io.pci.bus fault.io.pci.device fault.io.psycho
@@ -2914,13 +2914,13 @@
 msgid "SUN4U-8005-NC.severity"
 msgstr "Critical"
 msgid "SUN4U-8005-NC.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8005-NC.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8005-NC.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8005-NC.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8005-PR
 # keys: fault.io.datapath fault.io.pci.bus fault.io.pci.device fault.io.psycho
@@ -2930,13 +2930,13 @@
 msgid "SUN4U-8005-PR.severity"
 msgstr "Critical"
 msgid "SUN4U-8005-PR.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8005-PR.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8005-PR.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8005-PR.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8005-Q4
 # keys: defect.io.pci.driver fault.io.datapath fault.io.pci.bus fault.io.pci.device fault.io.psycho
@@ -2946,13 +2946,13 @@
 msgid "SUN4U-8005-Q4.severity"
 msgstr "Critical"
 msgid "SUN4U-8005-Q4.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8005-Q4.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8005-Q4.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8005-Q4.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8005-RD
 # keys: fault.io.hbus fault.io.pci.bus fault.io.pci.device fault.io.psycho
@@ -2962,13 +2962,13 @@
 msgid "SUN4U-8005-RD.severity"
 msgstr "Critical"
 msgid "SUN4U-8005-RD.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8005-RD.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8005-RD.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8005-RD.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8005-SH
 # keys: defect.io.pci.driver fault.io.hbus fault.io.pci.bus fault.io.pci.device fault.io.psycho
@@ -2978,13 +2978,13 @@
 msgid "SUN4U-8005-SH.severity"
 msgstr "Critical"
 msgid "SUN4U-8005-SH.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8005-SH.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8005-SH.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8005-SH.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8005-T3
 # keys: fault.io.datapath fault.io.hbus fault.io.pci.bus fault.io.pci.device fault.io.psycho
@@ -2994,13 +2994,13 @@
 msgid "SUN4U-8005-T3.severity"
 msgstr "Critical"
 msgid "SUN4U-8005-T3.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8005-T3.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8005-T3.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8005-T3.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8005-UY
 # keys: defect.io.pci.driver fault.io.datapath fault.io.hbus fault.io.pci.bus fault.io.pci.device fault.io.psycho
@@ -3010,13 +3010,13 @@
 msgid "SUN4U-8005-UY.severity"
 msgstr "Critical"
 msgid "SUN4U-8005-UY.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8005-UY.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8005-UY.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8005-UY.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8005-V5
 # keys: fault.io.tomatillo
@@ -3026,13 +3026,13 @@
 msgid "SUN4U-8005-V5.severity"
 msgstr "Critical"
 msgid "SUN4U-8005-V5.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8005-V5.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8005-V5.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8005-V5.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8005-WS
 # keys: defect.io.pci.driver fault.io.tomatillo
@@ -3042,13 +3042,13 @@
 msgid "SUN4U-8005-WS.severity"
 msgstr "Critical"
 msgid "SUN4U-8005-WS.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8005-WS.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8005-WS.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8005-WS.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8005-XA
 # keys: fault.io.datapath fault.io.tomatillo
@@ -3058,13 +3058,13 @@
 msgid "SUN4U-8005-XA.severity"
 msgstr "Critical"
 msgid "SUN4U-8005-XA.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8005-XA.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8005-XA.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8005-XA.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8005-YP
 # keys: defect.io.pci.driver fault.io.datapath fault.io.tomatillo
@@ -3074,13 +3074,13 @@
 msgid "SUN4U-8005-YP.severity"
 msgstr "Critical"
 msgid "SUN4U-8005-YP.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8005-YP.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8005-YP.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8005-YP.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8006-04
 # keys: fault.io.hbus fault.io.tomatillo
@@ -3090,13 +3090,13 @@
 msgid "SUN4U-8006-04.severity"
 msgstr "Critical"
 msgid "SUN4U-8006-04.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8006-04.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8006-04.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8006-04.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8006-1R
 # keys: defect.io.pci.driver fault.io.hbus fault.io.tomatillo
@@ -3106,13 +3106,13 @@
 msgid "SUN4U-8006-1R.severity"
 msgstr "Critical"
 msgid "SUN4U-8006-1R.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8006-1R.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8006-1R.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8006-1R.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8006-2C
 # keys: fault.io.datapath fault.io.hbus fault.io.tomatillo
@@ -3122,13 +3122,13 @@
 msgid "SUN4U-8006-2C.severity"
 msgstr "Critical"
 msgid "SUN4U-8006-2C.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8006-2C.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8006-2C.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8006-2C.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8006-3Q
 # keys: defect.io.pci.driver fault.io.datapath fault.io.hbus fault.io.tomatillo
@@ -3138,13 +3138,13 @@
 msgid "SUN4U-8006-3Q.severity"
 msgstr "Critical"
 msgid "SUN4U-8006-3Q.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8006-3Q.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8006-3Q.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8006-3Q.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8006-4E
 # keys: fault.io.pci.bus fault.io.tomatillo
@@ -3154,13 +3154,13 @@
 msgid "SUN4U-8006-4E.severity"
 msgstr "Critical"
 msgid "SUN4U-8006-4E.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8006-4E.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8006-4E.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8006-4E.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8006-5J
 # keys: defect.io.pci.driver fault.io.pci.bus fault.io.tomatillo
@@ -3170,13 +3170,13 @@
 msgid "SUN4U-8006-5J.severity"
 msgstr "Critical"
 msgid "SUN4U-8006-5J.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8006-5J.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8006-5J.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8006-5J.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8006-62
 # keys: fault.io.datapath fault.io.pci.bus fault.io.tomatillo
@@ -3186,13 +3186,13 @@
 msgid "SUN4U-8006-62.severity"
 msgstr "Critical"
 msgid "SUN4U-8006-62.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8006-62.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8006-62.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8006-62.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8006-7X
 # keys: defect.io.pci.driver fault.io.datapath fault.io.pci.bus fault.io.tomatillo
@@ -3202,13 +3202,13 @@
 msgid "SUN4U-8006-7X.severity"
 msgstr "Critical"
 msgid "SUN4U-8006-7X.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8006-7X.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8006-7X.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8006-7X.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8006-8P
 # keys: fault.io.hbus fault.io.pci.bus fault.io.tomatillo
@@ -3218,13 +3218,13 @@
 msgid "SUN4U-8006-8P.severity"
 msgstr "Critical"
 msgid "SUN4U-8006-8P.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8006-8P.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8006-8P.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8006-8P.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8006-9A
 # keys: defect.io.pci.driver fault.io.hbus fault.io.pci.bus fault.io.tomatillo
@@ -3234,13 +3234,13 @@
 msgid "SUN4U-8006-9A.severity"
 msgstr "Critical"
 msgid "SUN4U-8006-9A.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8006-9A.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8006-9A.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8006-9A.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8006-AS
 # keys: fault.io.datapath fault.io.hbus fault.io.pci.bus fault.io.tomatillo
@@ -3250,13 +3250,13 @@
 msgid "SUN4U-8006-AS.severity"
 msgstr "Critical"
 msgid "SUN4U-8006-AS.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8006-AS.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8006-AS.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8006-AS.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8006-C5
 # keys: defect.io.pci.driver fault.io.datapath fault.io.hbus fault.io.pci.bus fault.io.tomatillo
@@ -3266,13 +3266,13 @@
 msgid "SUN4U-8006-C5.severity"
 msgstr "Critical"
 msgid "SUN4U-8006-C5.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8006-C5.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8006-C5.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8006-C5.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8006-DY
 # keys: fault.io.pci.device fault.io.tomatillo
@@ -3282,13 +3282,13 @@
 msgid "SUN4U-8006-DY.severity"
 msgstr "Critical"
 msgid "SUN4U-8006-DY.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8006-DY.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8006-DY.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8006-DY.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8006-E3
 # keys: defect.io.pci.driver fault.io.pci.device fault.io.tomatillo
@@ -3298,13 +3298,13 @@
 msgid "SUN4U-8006-E3.severity"
 msgstr "Critical"
 msgid "SUN4U-8006-E3.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8006-E3.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8006-E3.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8006-E3.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8006-FH
 # keys: fault.io.datapath fault.io.pci.device fault.io.tomatillo
@@ -3314,13 +3314,13 @@
 msgid "SUN4U-8006-FH.severity"
 msgstr "Critical"
 msgid "SUN4U-8006-FH.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8006-FH.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8006-FH.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8006-FH.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8006-GD
 # keys: defect.io.pci.driver fault.io.datapath fault.io.pci.device fault.io.tomatillo
@@ -3330,13 +3330,13 @@
 msgid "SUN4U-8006-GD.severity"
 msgstr "Critical"
 msgid "SUN4U-8006-GD.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8006-GD.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8006-GD.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8006-GD.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8006-HQ
 # keys: fault.io.hbus fault.io.pci.device fault.io.tomatillo
@@ -3346,13 +3346,13 @@
 msgid "SUN4U-8006-HQ.severity"
 msgstr "Critical"
 msgid "SUN4U-8006-HQ.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8006-HQ.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8006-HQ.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8006-HQ.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8006-JC
 # keys: defect.io.pci.driver fault.io.hbus fault.io.pci.device fault.io.tomatillo
@@ -3362,13 +3362,13 @@
 msgid "SUN4U-8006-JC.severity"
 msgstr "Critical"
 msgid "SUN4U-8006-JC.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8006-JC.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8006-JC.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8006-JC.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8006-KR
 # keys: fault.io.datapath fault.io.hbus fault.io.pci.device fault.io.tomatillo
@@ -3378,13 +3378,13 @@
 msgid "SUN4U-8006-KR.severity"
 msgstr "Critical"
 msgid "SUN4U-8006-KR.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8006-KR.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8006-KR.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8006-KR.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8006-L4
 # keys: defect.io.pci.driver fault.io.datapath fault.io.hbus fault.io.pci.device fault.io.tomatillo
@@ -3394,13 +3394,13 @@
 msgid "SUN4U-8006-L4.severity"
 msgstr "Critical"
 msgid "SUN4U-8006-L4.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8006-L4.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8006-L4.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8006-L4.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8006-MX
 # keys: fault.io.pci.bus fault.io.pci.device fault.io.tomatillo
@@ -3410,13 +3410,13 @@
 msgid "SUN4U-8006-MX.severity"
 msgstr "Critical"
 msgid "SUN4U-8006-MX.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8006-MX.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8006-MX.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8006-MX.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8006-N2
 # keys: defect.io.pci.driver fault.io.pci.bus fault.io.pci.device fault.io.tomatillo
@@ -3426,13 +3426,13 @@
 msgid "SUN4U-8006-N2.severity"
 msgstr "Critical"
 msgid "SUN4U-8006-N2.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8006-N2.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8006-N2.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8006-N2.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8006-PJ
 # keys: fault.io.datapath fault.io.pci.bus fault.io.pci.device fault.io.tomatillo
@@ -3442,13 +3442,13 @@
 msgid "SUN4U-8006-PJ.severity"
 msgstr "Critical"
 msgid "SUN4U-8006-PJ.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8006-PJ.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8006-PJ.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8006-PJ.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8006-QE
 # keys: defect.io.pci.driver fault.io.datapath fault.io.pci.bus fault.io.pci.device fault.io.tomatillo
@@ -3458,13 +3458,13 @@
 msgid "SUN4U-8006-QE.severity"
 msgstr "Critical"
 msgid "SUN4U-8006-QE.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8006-QE.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8006-QE.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8006-QE.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8006-R5
 # keys: fault.io.hbus fault.io.pci.bus fault.io.pci.device fault.io.tomatillo
@@ -3474,13 +3474,13 @@
 msgid "SUN4U-8006-R5.severity"
 msgstr "Critical"
 msgid "SUN4U-8006-R5.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8006-R5.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8006-R5.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8006-R5.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8006-SS
 # keys: defect.io.pci.driver fault.io.hbus fault.io.pci.bus fault.io.pci.device fault.io.tomatillo
@@ -3490,13 +3490,13 @@
 msgid "SUN4U-8006-SS.severity"
 msgstr "Critical"
 msgid "SUN4U-8006-SS.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8006-SS.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8006-SS.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8006-SS.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8006-TA
 # keys: fault.io.datapath fault.io.hbus fault.io.pci.bus fault.io.pci.device fault.io.tomatillo
@@ -3506,13 +3506,13 @@
 msgid "SUN4U-8006-TA.severity"
 msgstr "Critical"
 msgid "SUN4U-8006-TA.description"
-msgstr "\n\nA problem was detected in a system core bus.\n  Refer to %s for more information."
+msgstr "\nA problem was detected in a system core bus.\n  Refer to %s for more information."
 msgid "SUN4U-8006-TA.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8006-TA.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8006-TA.action"
-msgstr "\n\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
+msgstr "\nSchedule a repair procedure to replace the affected device.  Use\nfmdump -v -u EVENT_ID to identify the device or contact\nSun for support.\n"
 #
 # code: SUN4U-8006-UP
 # keys: defect.io.pci.driver fault.io.datapath fault.io.hbus fault.io.pci.bus fault.io.pci.device fault.io.tomatillo
@@ -3522,13 +3522,13 @@
 msgid "SUN4U-8006-UP.severity"
 msgstr "Critical"
 msgid "SUN4U-8006-UP.description"
-msgstr "\n\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
+msgstr "\nThe system has diagnosed a problem, the suspects include one or more \nPCI buses, devices and one or more PCI controller drivers, based on the \nerror telemetry detected by the PCI subsystem.\n  Refer to %s for more information."
 msgid "SUN4U-8006-UP.response"
 msgstr "This fault requires user and/or service interaction and currently does not have an automated response agent."
 msgid "SUN4U-8006-UP.impact"
 msgstr "Possible loss of devices that may be attached to the system via this device/bus and/or system downtime."
 msgid "SUN4U-8006-UP.action"
-msgstr "\n\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
+msgstr "\nUse fmdump -v -u <EVENT_ID> to identify the \nsuspected device(s).  Schedule a repair of the most likely suspect \nlisted in the output.  If the most likely suspect is a package then run \npkgchk on the package(s).\n"
 #
 # code: SUN4U-8006-VD
 # keys: fault.cpu.ultraSPARC-IIIiplus.dcache
@@ -3730,7 +3730,7 @@
 msgid "SUN4U-8007-8J.severity"
 msgstr "Critical"
 msgid "SUN4U-8007-8J.description"
-msgstr "The number of errors associated with this CHIP has exceeded acceptable levels.\nRefer to %s for more information.  Refer to %s for more information."
+msgstr "The number of errors associated with this CORE has exceeded acceptable levels.\nRefer to %s for more information.  Refer to %s for more information."
 msgid "SUN4U-8007-8J.response"
 msgstr "An attempt will be made to remove the affected CORE from service."
 msgid "SUN4U-8007-8J.impact"
@@ -3769,3 +3769,51 @@
 msgstr "Loss of services provided by the device instances associated with this fault\n"
 msgid "SUN4U-8007-AX.action"
 msgstr "Ensure that the latest drivers and patches are installed. If a plug-in card is involved check for badly-seated cards or bent pins.  Otherwise schedule a repair procedure to replace the affected device(s).  Use fmdump -v -u <EVENT_ID> to identify the devices or contact Sun for support.\n"
+#
+# code: SUN4U-8007-C2
+# keys: fault.cpu.SPARC64-VII.chip
+#
+msgid "SUN4U-8007-C2.type"
+msgstr "Fault"
+msgid "SUN4U-8007-C2.severity"
+msgstr "Critical"
+msgid "SUN4U-8007-C2.description"
+msgstr "The number of errors associated with this CHIP has exceeded acceptable levels.\nRefer to %s for more information.  Refer to %s for more information."
+msgid "SUN4U-8007-C2.response"
+msgstr "An attempt will be made to remove the affected CHIP from service."
+msgid "SUN4U-8007-C2.impact"
+msgstr "The system will not be functioning at the same performance level with the CHIP removal."
+msgid "SUN4U-8007-C2.action"
+msgstr "Schedule a repair procedure to replace the affected CHIP.  Use fmdump -v -u <EVENT_ID>\nto identify the smallest CPU/Strand ID of the affected CORE on this\nCHIP."
+#
+# code: SUN4U-8007-DR
+# keys: fault.cpu.SPARC64-VII.core
+#
+msgid "SUN4U-8007-DR.type"
+msgstr "Fault"
+msgid "SUN4U-8007-DR.severity"
+msgstr "Critical"
+msgid "SUN4U-8007-DR.description"
+msgstr "The number of errors associated with this CORE has exceeded acceptable levels.\nRefer to %s for more information.  Refer to %s for more information."
+msgid "SUN4U-8007-DR.response"
+msgstr "An attempt will be made to remove the affected CORE from service."
+msgid "SUN4U-8007-DR.impact"
+msgstr "The system will not be functioning at the same performance level with the CORE removal."
+msgid "SUN4U-8007-DR.action"
+msgstr "Schedule a repair procedure to replace the affected CORE.  Use fmdump -v -u <EVENT_ID>\nto identify the smallest CPU/Strand ID of the affected CORE on this\nCORE.\n"
+#
+# code: SUN4U-8007-E4
+# keys: fault.cpu.SPARC64-VII.strand
+#
+msgid "SUN4U-8007-E4.type"
+msgstr "Fault"
+msgid "SUN4U-8007-E4.severity"
+msgstr "Critical"
+msgid "SUN4U-8007-E4.description"
+msgstr "The number of errors associated with this STRAND has exceeded acceptable levels.\nRefer to %s for more information.  Refer to %s for more information."
+msgid "SUN4U-8007-E4.response"
+msgstr "An attempt will be made to remove the affected STRAND from service."
+msgid "SUN4U-8007-E4.impact"
+msgstr "The system will not be functioning at the same performance level with the STRAND removal."
+msgid "SUN4U-8007-E4.action"
+msgstr "Schedule a repair procedure to replace the affected STRAND.  Use fmdump -v -u <EVENT_ID>\nto identify the smallest CPU/Strand ID of the affected CORE on this\nSTRAND.\n"
--- a/usr/src/cmd/fm/modules/SUNW,SPARC-Enterprise/cpumem-retire/cma_main.c	Wed Sep 12 19:25:16 2007 -0700
+++ b/usr/src/cmd/fm/modules/SUNW,SPARC-Enterprise/cpumem-retire/cma_main.c	Wed Sep 12 22:37:07 2007 -0700
@@ -68,6 +68,8 @@
 	    NULL },
 	{ "fault.cpu.SPARC64-VI.*", FM_FMRI_SCHEME_CPU, FM_CPU_SCHEME_VERSION,
 	    cma_cpu_retire },
+	{ "fault.cpu.SPARC64-VII.*", FM_FMRI_SCHEME_CPU, FM_CPU_SCHEME_VERSION,
+	    cma_cpu_retire },
 	{ "fault.chassis.SPARC-Enterprise.cpu.SPARC64-VI.core.se",
 		FM_FMRI_SCHEME_HC, FM_HC_SCHEME_VERSION, cma_cpu_hc_retire },
 	{ "fault.chassis.SPARC-Enterprise.cpu.SPARC64-VI.core.se-offlinereq",
@@ -76,6 +78,14 @@
 		FM_FMRI_SCHEME_HC, FM_HC_SCHEME_VERSION, cma_cpu_hc_retire },
 	{ "fault.chassis.SPARC-Enterprise.cpu.SPARC64-VI.core.ce-offlinereq",
 		FM_FMRI_SCHEME_HC, FM_HC_SCHEME_VERSION, cma_cpu_hc_retire },
+	{ "fault.chassis.SPARC-Enterprise.cpu.SPARC64-VII.core.se",
+		FM_FMRI_SCHEME_HC, FM_HC_SCHEME_VERSION, cma_cpu_hc_retire },
+	{ "fault.chassis.SPARC-Enterprise.cpu.SPARC64-VII.core.se-offlinereq",
+		FM_FMRI_SCHEME_HC, FM_HC_SCHEME_VERSION, cma_cpu_hc_retire },
+	{ "fault.chassis.SPARC-Enterprise.cpu.SPARC64-VII.core.ce",
+		FM_FMRI_SCHEME_HC, FM_HC_SCHEME_VERSION, cma_cpu_hc_retire },
+	{ "fault.chassis.SPARC-Enterprise.cpu.SPARC64-VII.core.ce-offlinereq",
+		FM_FMRI_SCHEME_HC, FM_HC_SCHEME_VERSION, cma_cpu_hc_retire },
 	{ NULL, NULL, 0, NULL }
 };
 
--- a/usr/src/cmd/fm/modules/sun4/cpumem-diagnosis/cmd_cpu.c	Wed Sep 12 19:25:16 2007 -0700
+++ b/usr/src/cmd/fm/modules/sun4/cpumem-diagnosis/cmd_cpu.c	Wed Sep 12 22:37:07 2007 -0700
@@ -70,6 +70,7 @@
 	"ultraSPARC-IIIiplus",
 	"ultraSPARC-T1",
 	"SPARC64-VI",
+	"SPARC64-VII",
 	"ultraSPARC-T2",
 	"ultraSPARC-T2plus"
 };
@@ -2266,7 +2267,8 @@
 	{"UltraSPARC-III",	CMD_CPU_FAM_CHEETAH},
 	{"UltraSPARC-IV",	CMD_CPU_FAM_CHEETAH},
 	{"UltraSPARC-T",	CMD_CPU_FAM_NIAGARA},
-	{"SPARC64-VI",		CMD_CPU_FAM_SPARC64}
+	{"SPARC64-VI",		CMD_CPU_FAM_SPARC64},
+	{"SPARC64-VII",		CMD_CPU_FAM_SPARC64}
 };
 
 cpu_family_t
--- a/usr/src/cmd/fm/modules/sun4/cpumem-diagnosis/cmd_cpu.h	Wed Sep 12 19:25:16 2007 -0700
+++ b/usr/src/cmd/fm/modules/sun4/cpumem-diagnosis/cmd_cpu.h	Wed Sep 12 22:37:07 2007 -0700
@@ -100,6 +100,7 @@
 	CPU_ULTRASPARC_IIIiplus,
 	CPU_ULTRASPARC_T1,
 	CPU_SPARC64_VI,
+	CPU_SPARC64_VII,
 	CPU_ULTRASPARC_T2,
 	CPU_ULTRASPARC_T2plus
 } cmd_cpu_type_t;
--- a/usr/src/cmd/fm/modules/sun4/cpumem-diagnosis/cmd_cpuerr.c	Wed Sep 12 19:25:16 2007 -0700
+++ b/usr/src/cmd/fm/modules/sun4/cpumem-diagnosis/cmd_cpuerr.c	Wed Sep 12 22:37:07 2007 -0700
@@ -176,7 +176,7 @@
 		    FM_EREPORT_PAYLOAD_NAME_RESOURCE, &rsrc) != 0)	\
 			return (CMD_EVD_BAD);				\
 									\
-		if ((cpu = cmd_cpu_lookup(hdl, rsrc, CPU_EREPORT_STRING,\
+		if ((cpu = cmd_cpu_lookup(hdl, rsrc, class,		\
 		    CMD_CPU_LEVEL_THREAD)) == NULL ||			\
 		    cpu->cpu_faulting)					\
 			return (CMD_EVD_UNUSED);			\
--- a/usr/src/cmd/fm/modules/sun4/cpumem-diagnosis/cmd_main.c	Wed Sep 12 19:25:16 2007 -0700
+++ b/usr/src/cmd/fm/modules/sun4/cpumem-diagnosis/cmd_main.c	Wed Sep 12 22:37:07 2007 -0700
@@ -26,8 +26,8 @@
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
- * CPU/Memory error diagnosis engine for the UltraSPARC III, IV, T1
- * and SPARC64 VI families of processors.
+ * CPU/Memory error diagnosis engine for the UltraSPARC III, IV, T1,
+ * SPARC64 VI and SPARC64 VII families of processors.
  */
 
 #include <cmd_state.h>
@@ -181,7 +181,7 @@
 	{ "ereport.cpu.*.bto",				cmd_nop },
 	{ "ereport.cpu.*.mtlb",				cmd_oplmtlb },
 	{ "ereport.cpu.*.tlbp",				cmd_opltlbp },
-	{ "ereport.cpu.*.inv-urg",			cmd_oplinv_urg },
+	{ "ereport.cpu.*.inv-uge",			cmd_oplinv_urg },
 	{ "ereport.cpu.*.cre",				cmd_oplcre },
 	{ "ereport.cpu.*.tsb-ctx",			cmd_opltsb_ctx },
 	{ "ereport.cpu.*.tsbp",				cmd_opltsbp },
@@ -703,6 +703,7 @@
 	 * OPL platform specific subscriptions.
 	 */
 	fmd_hdl_subscribe(hdl, "ereport.cpu.SPARC64-VI.*");
+	fmd_hdl_subscribe(hdl, "ereport.cpu.SPARC64-VII.*");
 	fmd_hdl_subscribe(hdl, "ereport.asic.mac.*");
 	fmd_hdl_subscribe(hdl, "ereport.io.oberon.ubc.dmarduea-mem");
 	fmd_hdl_subscribe(hdl, "ereport.io.oberon.ubc.dmarduea-channel");
--- a/usr/src/cmd/fm/modules/sun4u/cpumem-diagnosis/cmd_opl.c	Wed Sep 12 19:25:16 2007 -0700
+++ b/usr/src/cmd/fm/modules/sun4u/cpumem-diagnosis/cmd_opl.c	Wed Sep 12 22:37:07 2007 -0700
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -42,7 +42,7 @@
 {
 	opl_cpu_t *opl_cpu = NULL;
 	cmd_list_t *list_head = NULL;
-	uint32_t c, s, sib_cpuid, cur_cpuid;
+	uint32_t c, s, sib_cpuid, base_cpuid;
 
 	switch (flt_type) {
 	case IS_STRAND:
@@ -54,8 +54,8 @@
 
 	case IS_CORE:
 		/*
-		 * Based on the Olympus-C CPUID definition in multi-strands
-		 * mode to flip the bits to get the sibling strands
+		 * Currently there are only two strands per core.
+		 * Xor the least significant bit to get the sibling strand
 		 */
 		sib_cpuid = cpuid ^ 1;
 		for (s = 0; s <= STRAND_UPPER_BOUND; s++) {
@@ -75,28 +75,23 @@
 
 	case IS_CHIP:
 		/*
-		 * Based on the Olympus-C CPUID definition in multi-strand
-		 * mode to flip the bits in CPUID for getting the sibling
-		 * strand IDs
+		 * Enumerate all the cpus/strands based on the max # of cores
+		 * within a chip and max # of strands within a core.
 		 */
-		cur_cpuid = cpuid;
+		base_cpuid = (cpuid >> CHIPID_SHIFT) << CHIPID_SHIFT;
 		for (c = 0; c <= CORE_UPPER_BOUND; c++) {
-			sib_cpuid = cur_cpuid;
 			for (s = 0; s <= STRAND_UPPER_BOUND; s++) {
 				opl_cpu = fmd_hdl_alloc(hdl,
 				    sizeof (opl_cpu_t), FMD_SLEEP);
+				opl_cpu->oc_cpuid = base_cpuid |
+				    c << COREID_SHIFT | s;
 				if (c == 0 && s == 0) {
-					opl_cpu->oc_cpuid = cpuid;
 					cmd_list_append(&opl_cpu_list, opl_cpu);
 					list_head = &opl_cpu_list;
-				} else {
-					opl_cpu->oc_cpuid = sib_cpuid;
+				} else
 					cmd_list_insert_after(&opl_cpu_list,
 					    list_head, opl_cpu);
-				}
-				sib_cpuid = cur_cpuid ^ 1;
 			}
-			cur_cpuid = cur_cpuid ^ 2;
 		}
 		break;
 
--- a/usr/src/cmd/fm/modules/sun4u/cpumem-diagnosis/cmd_opl.h	Wed Sep 12 19:25:16 2007 -0700
+++ b/usr/src/cmd/fm/modules/sun4u/cpumem-diagnosis/cmd_opl.h	Wed Sep 12 22:37:07 2007 -0700
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -109,7 +109,6 @@
 
 extern cmd_list_t opl_cpu_list;
 
-#define	CPU_EREPORT_STRING	"ereport.cpu.SPARC64-VI."
 #define	OPL_CHASSIS_DEFAULT	"0"
 #define	OPL_CPU_FRU_FMRI_DC	FM_FMRI_SCHEME_HC":///" \
     FM_FMRI_LEGACY_HC"=/CMU"
@@ -141,7 +140,7 @@
 #define	IS_CORE			1
 #define	IS_CHIP			2
 #define	STRAND_UPPER_BOUND	1
-#define	CORE_UPPER_BOUND	1
+#define	CORE_UPPER_BOUND	3
 
 #define	COREID_SHIFT		1
 #define	CHIPID_SHIFT		3
--- a/usr/src/cmd/fm/modules/sun4u/cpumem-diagnosis/cmd_oplerr.c	Wed Sep 12 19:25:16 2007 -0700
+++ b/usr/src/cmd/fm/modules/sun4u/cpumem-diagnosis/cmd_oplerr.c	Wed Sep 12 22:37:07 2007 -0700
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -170,8 +170,8 @@
 				continue;
 			}
 
-			sib_cpu = cmd_cpu_lookup(hdl, fmri,
-			    CPU_EREPORT_STRING, CMD_CPU_LEVEL_THREAD);
+			sib_cpu = cmd_cpu_lookup(hdl, fmri, class,
+			    CMD_CPU_LEVEL_THREAD);
 			if (sib_cpu == NULL || sib_cpu->cpu_faulting) {
 				if (fmri != NULL)
 					nvlist_free(fmri);
--- a/usr/src/common/elfcap/elfcap.c	Wed Sep 12 19:25:16 2007 -0700
+++ b/usr/src/common/elfcap/elfcap.c	Wed Sep 12 22:37:07 2007 -0700
@@ -98,6 +98,7 @@
 static const char Hw1_s_reserved4[] = 	"RESERVED4";
 static const char Hw1_s_reserved5[] = 	"RESERVED5";
 static const char Hw1_s_fjfmau[] = 	"FJFMAU";
+static const char Hw1_s_ima[] = 	"IMA";
 #elif	CAP_LOWERCASE
 static const char Hw1_s_mul32[] =	"mul32";
 static const char Hw1_s_div32[] =	"div32";
@@ -114,6 +115,7 @@
 static const char Hw1_s_reserved4[] = 	"reserved4";
 static const char Hw1_s_reserved5[] = 	"reserved5";
 static const char Hw1_s_fjfmau[] =	"fjfmau";
+static const char Hw1_s_ima[] =		"ima";
 
 #else
 #error	"Hardware Capabilities (sparc) - what case do you want?"
@@ -139,7 +141,8 @@
 	{ 0,	Hw1_s_reserved3,	sizeof (Hw1_s_reserved3) - 1 },
 	{ 0,	Hw1_s_reserved4,	sizeof (Hw1_s_reserved4) - 1 },
 	{ 0,	Hw1_s_reserved5,	sizeof (Hw1_s_reserved5) - 1 },
-	{ AV_SPARC_FJFMAU,	Hw1_s_fjfmau,	sizeof (Hw1_s_fjfmau) - 1 }
+	{ AV_SPARC_FJFMAU,	Hw1_s_fjfmau,	sizeof (Hw1_s_fjfmau) - 1 },
+	{ AV_SPARC_IMA,		Hw1_s_ima,	sizeof (Hw1_s_ima) - 1 }
 };
 static const uint_t hw1_s_num = sizeof (hw1_s) / sizeof (Cap_desc);
 
--- a/usr/src/lib/libprtdiag_psr/sparc/opl/common/opl.c	Wed Sep 12 19:25:16 2007 -0700
+++ b/usr/src/lib/libprtdiag_psr/sparc/opl/common/opl.c	Wed Sep 12 22:37:07 2007 -0700
@@ -204,7 +204,7 @@
 
 				/* Get reg property of the node */
 				int_val = (int *)get_prop_val(find_prop
-					    (card_node, "reg"));
+				    (card_node, "reg"));
 
 				/*
 				 * If no "reg" property check to see
@@ -217,17 +217,17 @@
 						break;
 
 					name = (char *)get_prop_val(find_prop
-						    (cparent, "name"));
+					    (cparent, "name"));
 
 					type = (char *)get_prop_val(find_prop
-						    (cparent, "device_type"));
+					    (cparent, "device_type"));
 
 					/* check if parent is a bridge */
 					if (IS_PCI_BRIDGE(name, type))
 						pci_parent_bridge = 1;
 
 					int_val = (int *)get_prop_val(
-						find_prop(cparent, "reg"));
+					    find_prop(cparent, "reg"));
 
 					if (int_val != NULL)
 						/* Switch to parent */
@@ -240,7 +240,7 @@
 				if (!pci_parent_bridge) {
 
 					name = (char *)get_prop_val(find_prop
-						    (card_node, "name"));
+					    (card_node, "name"));
 
 					if (name == NULL)
 						card.name[0] = '\0';
@@ -251,7 +251,7 @@
 
 					/* Get the model of this card */
 					name = (char *)get_prop_val(find_prop
-						    (card_node, "model"));
+					    (card_node, "model"));
 
 					if (name == NULL) {
 						(void) snprintf(card.model,
@@ -262,8 +262,8 @@
 					}
 
 					/* insert card to the list */
-					card_list = insert_io_card
-						    (card_list, &card);
+					card_list = insert_io_card(card_list,
+					    &card);
 
 				}
 
@@ -368,7 +368,7 @@
 {
 	Board_node *bnode;
 	char *hdrfmt =
-	    "%-5.5s  %-8.8s  %-20.20s  %-8.8s  %-8.8s  %-8.8s %-8.8s\n";
+	    "%-4.4s  %-4.4s  %-40.40s  %-5.5s  %-5.5s  %-5.5s %-4.4s\n";
 
 	(void) textdomain(TEXT_DOMAIN);
 
@@ -385,7 +385,7 @@
 	log_printf(hdrfmt,
 	    "",
 	    gettext("CPU"),
-	    gettext("       CPU         "),
+	    gettext("              CPU                  "),
 	    gettext("Run"),
 	    gettext("L2$"),
 	    gettext("CPU"),
@@ -394,15 +394,15 @@
 	log_printf(hdrfmt,
 	    gettext("LSB"),
 	    gettext("Chip"),
-	    gettext("        ID         "),
+	    gettext("               ID                 "),
 	    gettext("MHz"),
 	    gettext(" MB"),
 	    gettext("Impl."),
 	    gettext("Mask"), 0);
 
 	log_printf(hdrfmt,
-	    "---", "----", "--------------------", "----",
-	    "---",  "-----", "----", 0);
+	"---", "----", "----------------------------------------", "----",
+	"---",  "-----", "----", 0);
 
 	/* Now display all of the cpus on each board */
 	for (bnode = tree->bd_list; bnode != NULL; bnode = bnode->next) {
@@ -438,31 +438,43 @@
 
 		portid = (int *)get_prop_val(find_prop(pnode, "portid"));
 		freq = (HZ_TO_MHZ(get_cpu_freq(pnode->child)));
-		l2cache_size =
-		    (int *)get_prop_val
-			(find_prop(pnode->child, "l2-cache-size"));
-		impl =
-		    (int *)get_prop_val
-			(find_prop(pnode->child, "implementation#"));
+		l2cache_size = (int *)get_prop_val(find_prop(pnode->child,
+		    "l2-cache-size"));
+		impl = (int *)get_prop_val(find_prop(pnode->child,
+		    "implementation#"));
 		mask = (int *)get_prop_val(find_prop(pnode->child, "mask#"));
 
 		/* Lsb id */
-		log_printf(" %02d    ", board->board_num, 0);
+		log_printf(" %02d   ", board->board_num, 0);
 
 		if (portid != NULL)
-			log_printf("%3d       ", (((*portid)>>3)&0x3), 0);
+			log_printf("%3d   ", (((*portid)>>3)&0x3), 0);
 
 		/*
+		 * OPL
 		 * Specific parsing of the CMP/CORE/CPU chain.
 		 * The internal cpu tree built by walk_di_tree()
 		 * in common code can be illustrated by the diagram
 		 * below:
 		 *
+		 * Olympus:
+		 *
 		 *   cmp->cpu->cpu->cpu->cpu->(next board nodes)
 		 *   / \
 		 * core core
+		 *
+		 * Jupiter:
+		 *
+		 * cmp->cpu->cpu->cpu->cpu->cpu->cpu->cpu->cpu->(board nodes)
+		 *   |
+		 *  _____________
+		 * /   \    \    \
+		 * core core core core
+		 *
+		 *
 		 * where "/" or "\" are children
 		 *    and "->" are siblings
+		 *
 		 */
 		for (cpu = pnode->sibling; cpu != NULL; ) {
 			Prom_node	*cpu_next = NULL;
@@ -490,48 +502,52 @@
 				(void) sprintf(cpu_str, "%4d", *cpuid);
 				(void) strlcat(fcpu_str, cpu_str, MAXSTRLEN);
 
-				if (cpu_next != NULL)
-				    (void) strlcat(fcpu_str, ",", MAXSTRLEN);
+				if (cpu_next != NULL) {
+					(void) strlcat(fcpu_str, ",",
+					    MAXSTRLEN);
+				}
 			} else {
 				(void) sprintf(cpu_str, "%4s", "N/A");
 				(void) strlcat(fcpu_str, cpu_str, MAXSTRLEN);
 
-				if (cpu_next != NULL)
-				    (void) strlcat(fcpu_str, ",", MAXSTRLEN);
+				if (cpu_next != NULL) {
+					(void) strlcat(fcpu_str, ",",
+					    MAXSTRLEN);
+				}
 			}
 			cpu = cpu_next;
 		}
 
-		log_printf("%-20.20s", fcpu_str, 0);
+		log_printf("%-40.40s", fcpu_str, 0);
 
 		/* Running frequency */
 		if (freq != 0)
-			log_printf("  %4ld     ", freq, 0);
+			log_printf("  %4ld  ", freq, 0);
 		else
-			log_printf("  %4s     ", "N/A", 0);
+			log_printf("  %4s  ", "N/A", 0);
 
 		/* L2 cache size */
 		if (l2cache_size == NULL)
 			log_printf(" %3s    ", "N/A", 0);
 		else {
-			log_printf("%4.1f       ",
+			log_printf("%4.1f   ",
 			    (float)(*l2cache_size) / (float)(1<<20), 0);
 		}
 
 
 		/* Implementation number of processor */
 		if (impl != NULL)
-			log_printf("%4d     ", *impl, 0);
+			log_printf("  %4d  ", *impl, 0);
 		else
-			log_printf("%4s     ", "N/A", 0);
+			log_printf(" %4s     ", "N/A", 0);
 
 		/* Mask Set version */
 		/* Bits 31:24 of VER register is mask. */
 		/* Mask value : Non MTP mode - 00-7f, MTP mode - 80-ff */
 		if (mask == NULL)
-			log_printf("%4s", "N/A", 0);
+			log_printf("%3s", "N/A", 0);
 		else
-			log_printf("%4d", (*mask)&0xff, 0);
+			log_printf("%-3d", (*mask)&0xff, 0);
 
 		log_printf("\n", 0);
 
@@ -582,9 +598,8 @@
 			}
 
 			if (cs_stat != NULL) {
-				total_mem +=
-				    print_opl_memory_line(bnode->board_num,
-					cs_stat, ngrps);
+				total_mem += print_opl_memory_line(
+				    bnode->board_num, cs_stat, ngrps);
 			}
 		}
 
@@ -602,8 +617,7 @@
 {
 	Board_node	*bnode = tree->bd_list;
 	uint64_t	total_mem = 0, total_sys_mem = 0;
-	char *hdrfmt =	"\n%-5.5s  %-6.6s  %-18.18s  %-10.10s"
-			    " %-8.8s  %-10.10s";
+	char *hdrfmt =	"\n%-5.5s  %-6.6s  %-18.18s  %-10.10s %-8.8s  %-10.10s";
 
 	(void) textdomain(TEXT_DOMAIN);
 
@@ -612,8 +626,7 @@
 	log_printf("======================", 0);
 	log_printf("\n", 0);
 
-	log_printf(hdrfmt,
-		"",
+	log_printf(hdrfmt, "",
 	    gettext("Memory"),
 	    gettext("Available"),
 	    gettext("Memory"),
@@ -648,10 +661,9 @@
 	    (_SC_PHYS_PAGES)) / MBYTE);
 
 	if (total_mem != total_sys_mem) {
-		log_printf(dgettext(TEXT_DOMAIN,
-		    "\nError:total available size [%lldMB] does not match"
-			" total system memory [%lldMB]\n"),
-			    total_mem, total_sys_mem, 0);
+		log_printf(dgettext(TEXT_DOMAIN, "\nError:total available "
+		    "size [%lldMB] does not match total system memory "
+		    "[%lldMB]\n"), total_mem, total_sys_mem, 0);
 	}
 
 }
@@ -878,9 +890,9 @@
 	char *type;
 
 	if ((board = get_board_num(pnode)) == -1) {
-	    type = get_node_type(pnode);
-	    if ((type != NULL) && (strcmp(type, "cpu") == 0))
-		board = get_board_num((pnode->parent)->parent);
+		type = get_node_type(pnode);
+		if ((type != NULL) && (strcmp(type, "cpu") == 0))
+			board = get_board_num((pnode->parent)->parent);
 	}
 
 	/* find the node with the same board number */
--- a/usr/src/pkgdefs/SUNWcakr.u/prototype_com	Wed Sep 12 19:25:16 2007 -0700
+++ b/usr/src/pkgdefs/SUNWcakr.u/prototype_com	Wed Sep 12 22:37:07 2007 -0700
@@ -102,6 +102,7 @@
 d none platform/SUNW,SPARC-Enterprise/kernel/cpu 755 root sys
 d none platform/SUNW,SPARC-Enterprise/kernel/cpu/sparcv9 755 root sys
 f none platform/SUNW,SPARC-Enterprise/kernel/cpu/sparcv9/FJSV,SPARC64-VI 755 root sys
+s none platform/SUNW,SPARC-Enterprise/kernel/cpu/sparcv9/FJSV,SPARC64-VII=FJSV,SPARC64-VI
 d none platform/SUNW,SPARC-Enterprise/kernel/crypto 755 root sys
 d none platform/SUNW,SPARC-Enterprise/kernel/crypto/sparcv9 755 root sys
 s none platform/SUNW,SPARC-Enterprise/kernel/crypto/sparcv9/aes=../../../../sun4u-us3/kernel/crypto/sparcv9/aes
--- a/usr/src/pkgdefs/SUNWcpcu/prototype_sparc	Wed Sep 12 19:25:16 2007 -0700
+++ b/usr/src/pkgdefs/SUNWcpcu/prototype_sparc	Wed Sep 12 22:37:07 2007 -0700
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
@@ -45,6 +45,7 @@
 f none usr/bin/sparcv9/cputrack 555 root bin
 d none usr/kernel/pcbe/sparcv9 755 root sys
 f none usr/kernel/pcbe/sparcv9/pcbe.4.6 755 root sys
+l none usr/kernel/pcbe/sparcv9/pcbe.4.7=pcbe.4.6 755 root sys
 f none usr/kernel/pcbe/sparcv9/pcbe.62 755 root sys
 l none usr/kernel/pcbe/sparcv9/pcbe.23=pcbe.62 755 root sys
 d none usr/lib/sparcv9 755 root bin
--- a/usr/src/uts/common/sys/auxv_SPARC.h	Wed Sep 12 19:25:16 2007 -0700
+++ b/usr/src/uts/common/sys/auxv_SPARC.h	Wed Sep 12 22:37:07 2007 -0700
@@ -48,10 +48,11 @@
 #define	AV_SPARC_ASI_BLK_INIT	0x0080	/* ASI_BLK_INIT_xxx ASI */
 #define	AV_SPARC_FMAF	0x0100	/* Fused Multiply-Add */
 #define	AV_SPARC_FJFMAU	0x4000	/* Fujitsu Unfused Multiply-Add */
+#define	AV_SPARC_IMA	0x8000	/* Integer Multiply-add */
 
 #define	FMT_AV_SPARC	\
-	"\20"		\
-	"\17fjfmau\11fmaf"  \
+	"\20" \
+	"\20ima\17fjfmau\16-\15-\14-\13-\12-\11fmaf" \
 	"\10ASIBlkInit\7vis2\6vis\5popc\4v8plus\3fsmuld\2div32\1mul32"
 
 /*
--- a/usr/src/uts/sparc/sys/fm/cpu/SPARC64-VI.h	Wed Sep 12 19:25:16 2007 -0700
+++ b/usr/src/uts/sparc/sys/fm/cpu/SPARC64-VI.h	Wed Sep 12 22:37:07 2007 -0700
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -34,6 +34,7 @@
 
 /* ereport class subcategories for SPARC64-VI */
 #define	FM_EREPORT_CPU_SPARC64_VI	"SPARC64-VI"
+#define	FM_EREPORT_CPU_SPARC64_VII	"SPARC64-VII"
 #define	FM_EREPORT_CPU_UNSUPPORTED	"unsupported"
 
 /*
@@ -109,7 +110,7 @@
 #define	FM_EREPORT_CPU_DAE 	"dae"
 #define	FM_EREPORT_CPU_IAE 	"iae"
 #define	FM_EREPORT_CPU_UGE 	"uge"
-#define	FM_EREPORT_CPU_INV_URG	"inv-urg"
+#define	FM_EREPORT_CPU_INV_URG	"inv-uge"
 
 #ifdef	__cplusplus
 }
--- a/usr/src/uts/sun4u/cpu/opl_olympus.c	Wed Sep 12 19:25:16 2007 -0700
+++ b/usr/src/uts/sun4u/cpu/opl_olympus.c	Wed Sep 12 22:37:07 2007 -0700
@@ -23,6 +23,10 @@
  * Use is subject to license terms.
  */
 
+/*
+ * Support for Olympus-C (SPARC64-VI) and Jupiter (SPARC64-VII).
+ */
+
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <sys/types.h>
@@ -91,6 +95,11 @@
  */
 int cpu_berr_to_verbose = 0;
 
+/*
+ * Set to 1 if booted with all Jupiter cpus (all-Jupiter features enabled).
+ */
+int cpu_alljupiter = 0;
+
 static int min_ecache_size;
 static uint_t priv_hcl_1;
 static uint_t priv_hcl_2;
@@ -261,6 +270,22 @@
 	vac = 1;
 }
 
+/*
+ * Enable features for Jupiter-only domains.
+ */
+void
+cpu_fix_alljupiter(void)
+{
+	cpu_alljupiter = 1;
+
+	/*
+	 * Enable ima hwcap for Jupiter-only domains.  DR will prevent
+	 * addition of Olympus-C to all-Jupiter domains to preserve ima
+	 * hwcap semantics.
+	 */
+	cpu_hwcap_flags |= AV_SPARC_IMA;
+}
+
 #ifdef	OLYMPUS_C_REV_B_ERRATA_XCALL
 /*
  * Quick and dirty way to redefine locally in
@@ -297,7 +322,7 @@
 #ifdef	OLYMPUS_C_REV_A_ERRATA_XCALL
 	ver = ultra_getver();
 	if (((ULTRA_VER_IMPL(ver)) == OLYMPUS_C_IMPL) &&
-		((OLYMPUS_REV_MASK(ver)) == OLYMPUS_C_A))
+	    ((OLYMPUS_REV_MASK(ver)) == OLYMPUS_C_A))
 		bn_sets = 1;
 #endif
 
@@ -365,9 +390,9 @@
 		if (tick > endtick) {
 			if (panic_quiesce)
 				return;
-			cmn_err(CE_CONT, "send mondo timeout "
-				"[%d NACK %d BUSY]\nIDSR 0x%"
-				"" PRIx64 "  cpuids:", nack, busy, idsr);
+			cmn_err(CE_CONT, "send mondo timeout [%d NACK %d "
+			    "BUSY]\nIDSR 0x%" PRIx64 "  cpuids:",
+			    nack, busy, idsr);
 #ifdef	OLYMPUS_C_REV_A_ERRATA_XCALL
 			for (i = 0; i < bn_sets; i++) {
 #else
@@ -375,8 +400,7 @@
 #endif
 				if (idsr & (IDSR_NACK_BIT(i) |
 				    IDSR_BUSY_BIT(i))) {
-					cmn_err(CE_CONT, " 0x%x",
-						cpuids[i]);
+					cmn_err(CE_CONT, " 0x%x", cpuids[i]);
 				}
 			}
 			cmn_err(CE_CONT, "\n");
@@ -427,7 +451,7 @@
 						break;
 
 					for ((index = ((int)next - 1));
-						index >= 0; index--)
+					    index >= 0; index--)
 						if (CPU_IN_SET(set, index)) {
 							next = (uint16_t)index;
 							break;
@@ -481,9 +505,11 @@
 void
 cpu_init_private(struct cpu *cp)
 {
-	if (!(IS_OLYMPUS_C(cpunodes[cp->cpu_id].implementation))) {
-		cmn_err(CE_PANIC, "CPU%d Impl %d: Only SPARC64-VI is supported",
-			cp->cpu_id, cpunodes[cp->cpu_id].implementation);
+	if (!((IS_OLYMPUS_C(cpunodes[cp->cpu_id].implementation)) ||
+	    (IS_JUPITER(cpunodes[cp->cpu_id].implementation)))) {
+		cmn_err(CE_PANIC, "CPU%d Impl %d: Only SPARC64-VI(I) is "
+		    "supported", cp->cpu_id,
+		    cpunodes[cp->cpu_id].implementation);
 	}
 
 	adjust_hw_copy_limits(cpunodes[cp->cpu_id].ecache_size);
@@ -644,9 +670,8 @@
 		if (tick > endtick) {
 			if (panic_quiesce)
 				return;
-			cmn_err(CE_PANIC, "send mondo timeout "
-				"(target 0x%x) [%d NACK %d BUSY]",
-					cpuid, nack, busy);
+			cmn_err(CE_PANIC, "send mondo timeout (target 0x%x) "
+			    "[%d NACK %d BUSY]", cpuid, nack, busy);
 		}
 
 		if (idsr & busymask) {
@@ -1036,16 +1061,16 @@
 			opl_flt->flt_eid_mod = OPL_ERRID_CHANNEL;
 		}
 		if (opl_flt->flt_bit & (SFSR_TLB_MUL|SFSR_TLB_PRT)) {
-			    opl_flt->flt_eid_mod = OPL_ERRID_CPU;
-			    opl_flt->flt_eid_sid = aflt->flt_inst;
+			opl_flt->flt_eid_mod = OPL_ERRID_CPU;
+			opl_flt->flt_eid_sid = aflt->flt_inst;
 		}
 
 		/*
 		 * In case of no effective error bit
 		 */
 		if ((opl_flt->flt_bit & SFSR_ERRS) == 0) {
-			    opl_flt->flt_eid_mod = OPL_ERRID_CPU;
-			    opl_flt->flt_eid_sid = aflt->flt_inst;
+			opl_flt->flt_eid_mod = OPL_ERRID_CPU;
+			opl_flt->flt_eid_sid = aflt->flt_inst;
 		}
 		break;
 
@@ -1146,7 +1171,7 @@
 
 	if (&plat_get_mem_unum) {
 		if ((ret = plat_get_mem_unum(synd_code, flt_addr, flt_bus_id,
-			flt_in_memory, flt_status, buf, buflen, lenp)) != 0) {
+		    flt_in_memory, flt_status, buf, buflen, lenp)) != 0) {
 			buf[0] = '\0';
 			*lenp = 0;
 		}
@@ -1200,11 +1225,10 @@
 		synd_status = AFLT_STAT_VALID;
 
 	flt_in_memory = (*afsr & SFSR_MEMORY) &&
-		pf_is_memory(afar >> MMU_PAGESHIFT);
+	    pf_is_memory(afar >> MMU_PAGESHIFT);
 
 	ret = cpu_get_mem_unum(synd_status, (ushort_t)synd, *afsr, afar,
-		CPU->cpu_id, flt_in_memory, flt_status, unum,
-		UNUM_NAMLEN, lenp);
+	    CPU->cpu_id, flt_in_memory, flt_status, unum, UNUM_NAMLEN, lenp);
 	if (ret != 0)
 		return (ret);
 
@@ -1232,9 +1256,8 @@
 		return (ENXIO);
 
 	if (p2get_mem_info != NULL)
-		return ((p2get_mem_info)(synd_code, afar,
-			mem_sizep, seg_sizep, bank_sizep,
-			segsp, banksp, mcidp));
+		return ((p2get_mem_info)(synd_code, afar, mem_sizep, seg_sizep,
+		    bank_sizep, segsp, banksp, mcidp));
 	else
 		return (ENOTSUP);
 }
@@ -1250,8 +1273,8 @@
 	char unum[UNUM_NAMLEN];
 
 	if (&plat_get_cpu_unum) {
-		if ((ret = plat_get_cpu_unum(cpuid, unum, UNUM_NAMLEN, lenp))
-			!= 0)
+		if ((ret = plat_get_cpu_unum(cpuid, unum, UNUM_NAMLEN,
+		    lenp)) != 0)
 			return (ret);
 	} else {
 		return (ENOTSUP);
@@ -1313,15 +1336,15 @@
 
 	if (aflt->flt_payload & FM_EREPORT_PAYLOAD_FLAG_SFSR) {
 		fm_payload_set(payload, FM_EREPORT_PAYLOAD_NAME_SFSR,
-			DATA_TYPE_UINT64, aflt->flt_stat, NULL);
+		    DATA_TYPE_UINT64, aflt->flt_stat, NULL);
 	}
 	if (aflt->flt_payload & FM_EREPORT_PAYLOAD_FLAG_SFAR) {
 		fm_payload_set(payload, FM_EREPORT_PAYLOAD_NAME_SFAR,
-			DATA_TYPE_UINT64, aflt->flt_addr, NULL);
+		    DATA_TYPE_UINT64, aflt->flt_addr, NULL);
 	}
 	if (aflt->flt_payload & FM_EREPORT_PAYLOAD_FLAG_UGESR) {
 		fm_payload_set(payload, FM_EREPORT_PAYLOAD_NAME_UGESR,
-			DATA_TYPE_UINT64, aflt->flt_stat, NULL);
+		    DATA_TYPE_UINT64, aflt->flt_stat, NULL);
 	}
 	if (aflt->flt_payload & FM_EREPORT_PAYLOAD_FLAG_PC) {
 		fm_payload_set(payload, FM_EREPORT_PAYLOAD_NAME_PC,
@@ -1342,20 +1365,18 @@
 	}
 	if (aflt->flt_payload & FM_EREPORT_PAYLOAD_FLAG_FLT_STATUS) {
 		fm_payload_set(payload, FM_EREPORT_PAYLOAD_NAME_FLT_STATUS,
-			DATA_TYPE_UINT64, (uint64_t)aflt->flt_status, NULL);
+		    DATA_TYPE_UINT64, (uint64_t)aflt->flt_status, NULL);
 	}
 
 	switch (opl_flt->flt_eid_mod) {
 	case OPL_ERRID_CPU:
 		(void) snprintf(sbuf, sizeof (sbuf), "%llX",
-			(u_longlong_t)cpunodes[opl_flt->flt_eid_sid].device_id);
+		    (u_longlong_t)cpunodes[opl_flt->flt_eid_sid].device_id);
 		(void) fm_fmri_cpu_set(resource, FM_CPU_SCHEME_VERSION,
-			NULL, opl_flt->flt_eid_sid,
-			(uint8_t *)&cpunodes[opl_flt->flt_eid_sid].version,
-			sbuf);
-		fm_payload_set(payload,
-			FM_EREPORT_PAYLOAD_NAME_RESOURCE,
-			DATA_TYPE_NVLIST, resource, NULL);
+		    NULL, opl_flt->flt_eid_sid,
+		    (uint8_t *)&cpunodes[opl_flt->flt_eid_sid].version, sbuf);
+		fm_payload_set(payload, FM_EREPORT_PAYLOAD_NAME_RESOURCE,
+		    DATA_TYPE_NVLIST, resource, NULL);
 		break;
 
 	case OPL_ERRID_CHANNEL:
@@ -1368,10 +1389,10 @@
 
 	case OPL_ERRID_MEM:
 		(void) cpu_get_mem_unum_aflt(0, aflt, unum, UNUM_NAMLEN, &len);
-		(void) fm_fmri_mem_set(resource, FM_MEM_SCHEME_VERSION,
-			NULL, unum, NULL, (uint64_t)-1);
+		(void) fm_fmri_mem_set(resource, FM_MEM_SCHEME_VERSION, NULL,
+		    unum, NULL, (uint64_t)-1);
 		fm_payload_set(payload, FM_EREPORT_PAYLOAD_NAME_RESOURCE,
-			DATA_TYPE_NVLIST, resource, NULL);
+		    DATA_TYPE_NVLIST, resource, NULL);
 		break;
 
 	case OPL_ERRID_PATH:
@@ -1463,6 +1484,9 @@
 	case OLYMPUS_C_IMPL:
 		cpu_type = FM_EREPORT_CPU_SPARC64_VI;
 		break;
+	case JUPITER_IMPL:
+		cpu_type = FM_EREPORT_CPU_SPARC64_VII;
+		break;
 	default:
 		cpu_type = FM_EREPORT_CPU_UNSUPPORTED;
 		break;
@@ -1685,7 +1709,7 @@
 	 */
 
 	this_cpu_log = va_to_pa((void*)(((uint64_t)opl_err_log) +
-		ERRLOG_BUFSZ * (getprocessorid())));
+	    ERRLOG_BUFSZ * (getprocessorid())));
 	opl_error_setup(this_cpu_log);
 
 	/*
@@ -1715,10 +1739,8 @@
 	aflt->flt_payload = eccp->ec_err_payload;
 
 	ASSERT(aflt->flt_status & (OPL_ECC_SYNC_TRAP|OPL_ECC_URGENT_TRAP));
-	cpu_errorq_dispatch(eccp->ec_err_class,
-		(void *)opl_flt, sizeof (opl_async_flt_t),
-		ue_queue,
-		aflt->flt_panic);
+	cpu_errorq_dispatch(eccp->ec_err_class, (void *)opl_flt,
+	    sizeof (opl_async_flt_t), ue_queue, aflt->flt_panic);
 }
 
 /*
@@ -1737,7 +1759,7 @@
 	 * in the ecc_type_to_info table.
 	 */
 	for (eccp = ecc_type_to_info; t_afsr_errs != 0 && eccp->ec_desc != NULL;
-		eccp++) {
+	    eccp++) {
 		if ((eccp->ec_afsr_bit & t_afsr_errs) != 0 &&
 		    (eccp->ec_flags & aflt->flt_status) != 0) {
 			/*
@@ -1749,12 +1771,10 @@
 			 * ue_channel, ue_cpu or ue_path.
 			 */
 			if (eccp->ec_flt_type == OPL_CPU_SYNC_UE) {
-				opl_flt->flt_eid_mod =
-					(aflt->flt_stat & SFSR_EID_MOD)
-					>> SFSR_EID_MOD_SHIFT;
-				opl_flt->flt_eid_sid =
-					(aflt->flt_stat & SFSR_EID_SID)
-					>> SFSR_EID_SID_SHIFT;
+				opl_flt->flt_eid_mod = (aflt->flt_stat &
+				    SFSR_EID_MOD) >> SFSR_EID_MOD_SHIFT;
+				opl_flt->flt_eid_sid = (aflt->flt_stat &
+				    SFSR_EID_SID) >> SFSR_EID_SID_SHIFT;
 				/*
 				 * Need to advance eccp pointer by flt_eid_mod
 				 * so that we get an appropriate ecc pointer
@@ -1873,8 +1893,8 @@
 	aflt->flt_pc = (caddr_t)rp->r_pc;
 	aflt->flt_prot = (uchar_t)AFLT_PROT_NONE;
 	aflt->flt_class = (uchar_t)CPU_FAULT;
-	aflt->flt_priv = (uchar_t)
-		(tl == 1 ? 1 : ((rp->r_tstate & TSTATE_PRIV) ?  1 : 0));
+	aflt->flt_priv = (uchar_t)(tl == 1 ? 1 : ((rp->r_tstate &
+	    TSTATE_PRIV) ? 1 : 0));
 	aflt->flt_tl = (uchar_t)tl;
 	aflt->flt_panic = (uchar_t)(tl != 0 || aft_testfatal != 0 ||
 	    (t_sfsr & (SFSR_TLB_MUL|SFSR_TLB_PRT)) != 0);
@@ -1891,9 +1911,8 @@
 		opl_flt.flt_type = OPL_CPU_INV_SFSR;
 		aflt->flt_panic = 1;
 		aflt->flt_payload = FM_EREPORT_PAYLOAD_SYNC;
-		cpu_errorq_dispatch(FM_EREPORT_CPU_INV_SFSR,
-			(void *)&opl_flt, sizeof (opl_async_flt_t), ue_queue,
-			aflt->flt_panic);
+		cpu_errorq_dispatch(FM_EREPORT_CPU_INV_SFSR, (void *)&opl_flt,
+		    sizeof (opl_async_flt_t), ue_queue, aflt->flt_panic);
 		fm_panic("%sErrors(s)", "invalid SFSR");
 	}
 
@@ -1987,14 +2006,12 @@
 			log_sfsr &= ~(SFSR_TO | SFSR_BERR);
 	}
 
-	if (((log_sfsr & SFSR_ERRS) &&
-		(cpu_queue_events(&opl_flt, pr_reason, t_sfsr) == 0)) ||
-	    ((t_sfsr & SFSR_ERRS) == 0)) {
+	if (((log_sfsr & SFSR_ERRS) && (cpu_queue_events(&opl_flt, pr_reason,
+	    t_sfsr) == 0)) || ((t_sfsr & SFSR_ERRS) == 0)) {
 		opl_flt.flt_type = OPL_CPU_INV_SFSR;
 		aflt->flt_payload = FM_EREPORT_PAYLOAD_SYNC;
-		cpu_errorq_dispatch(FM_EREPORT_CPU_INV_SFSR,
-			(void *)&opl_flt, sizeof (opl_async_flt_t), ue_queue,
-			aflt->flt_panic);
+		cpu_errorq_dispatch(FM_EREPORT_CPU_INV_SFSR, (void *)&opl_flt,
+		    sizeof (opl_async_flt_t), ue_queue, aflt->flt_panic);
 	}
 
 	if (t_sfsr & (SFSR_UE|SFSR_TO|SFSR_BERR)) {
@@ -2021,8 +2038,7 @@
 	if (!aflt->flt_priv || aflt->flt_prot == AFLT_PROT_COPY) {
 		int pcb_flag = 0;
 
-		if (t_sfsr & (SFSR_ERRS &
-			~(SFSR_BERR | SFSR_TO)))
+		if (t_sfsr & (SFSR_ERRS & ~(SFSR_BERR | SFSR_TO)))
 			pcb_flag |= ASYNC_HWERR;
 
 		if (t_sfsr & SFSR_BERR)
@@ -2057,8 +2073,8 @@
 	aflt->flt_pc = (caddr_t)rp->r_pc;
 	aflt->flt_class = (uchar_t)CPU_FAULT;
 	aflt->flt_tl = tl;
-	aflt->flt_priv = (uchar_t)
-		(tl == 1 ? 1 : ((rp->r_tstate & TSTATE_PRIV) ?  1 : 0));
+	aflt->flt_priv = (uchar_t)(tl == 1 ? 1 : ((rp->r_tstate & TSTATE_PRIV) ?
+	    1 : 0));
 	aflt->flt_status = OPL_ECC_URGENT_TRAP;
 	aflt->flt_panic = 1;
 	/*
@@ -2071,9 +2087,8 @@
 	if (cpu_queue_events(&opl_flt, pr_reason, p_ugesr) == 0) {
 		opl_flt.flt_type = OPL_CPU_INV_UGESR;
 		aflt->flt_payload = FM_EREPORT_PAYLOAD_URGENT;
-		cpu_errorq_dispatch(FM_EREPORT_CPU_INV_URG,
-			(void *)&opl_flt, sizeof (opl_async_flt_t),
-			ue_queue, aflt->flt_panic);
+		cpu_errorq_dispatch(FM_EREPORT_CPU_INV_URG, (void *)&opl_flt,
+		    sizeof (opl_async_flt_t), ue_queue, aflt->flt_panic);
 	}
 
 	fm_panic("Urgent Error");
@@ -2125,7 +2140,7 @@
 
 	hat->sfmmu_cext = new_cext_primary;
 	kcontextreg = ((uint64_t)new_cext_nucleus << CTXREG_NEXT_SHIFT) |
-		((uint64_t)new_cext_primary << CTXREG_EXT_SHIFT);
+	    ((uint64_t)new_cext_primary << CTXREG_EXT_SHIFT);
 }
 
 size_t
--- a/usr/src/uts/sun4u/cpu/opl_olympus_asm.s	Wed Sep 12 19:25:16 2007 -0700
+++ b/usr/src/uts/sun4u/cpu/opl_olympus_asm.s	Wed Sep 12 22:37:07 2007 -0700
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  *
  * Assembly code support for the Olympus-C module
@@ -1019,6 +1019,44 @@
 #endif /* lint */
 
 /*
+ * In case of errors in the MMU_TSB_PREFETCH registers we have to
+ * reset them. We can use "0" as the reset value, this way we set
+ * the "V" bit of the registers to 0, which will disable the prefetch
+ * so the values of the other fields are irrelevant.
+ */
+#if !defined(lint)
+#define	RESET_TSB_PREFETCH(tmp)			\
+	set	VA_UTSBPREF_8K, tmp 		;\
+	stxa	%g0, [tmp]ASI_ITSB_PREFETCH	;\
+	set	VA_UTSBPREF_4M, tmp 		;\
+	stxa	%g0, [tmp]ASI_ITSB_PREFETCH	;\
+	set	VA_KTSBPREF_8K, tmp 		;\
+	stxa	%g0, [tmp]ASI_ITSB_PREFETCH	;\
+	set	VA_KTSBPREF_4M, tmp 		;\
+	stxa	%g0, [tmp]ASI_ITSB_PREFETCH	;\
+	set	VA_UTSBPREF_8K, tmp 		;\
+	stxa	%g0, [tmp]ASI_DTSB_PREFETCH	;\
+	set	VA_UTSBPREF_4M, tmp 		;\
+	stxa	%g0, [tmp]ASI_DTSB_PREFETCH	;\
+	set	VA_KTSBPREF_8K, tmp 		;\
+	stxa	%g0, [tmp]ASI_DTSB_PREFETCH	;\
+	set	VA_KTSBPREF_4M, tmp 		;\
+	stxa	%g0, [tmp]ASI_DTSB_PREFETCH
+#endif /* lint */
+
+/*
+ * In case of errors in the MMU_SHARED_CONTEXT register we have to
+ * reset its value. We can use "0" as the reset value, it will put
+ * 0 in the IV field disabling the shared context support, and
+ * making values of all the other fields of the register irrelevant.
+ */
+#if !defined(lint)
+#define	RESET_SHARED_CTXT(tmp)			\
+	set	MMU_SHARED_CONTEXT, tmp		;\
+	stxa	%g0, [tmp]ASI_DMMU
+#endif /* lint */
+
+/*
  * RESET_TO_PRIV()
  *
  * In many cases, we need to force the thread into privilege mode because
@@ -1486,6 +1524,12 @@
 	andcc	%g1, %g2, %g0
 	bz,pt	%xcc, opl_uger_tsbp
 	 nop
+	GET_CPU_IMPL(%g2)
+	cmp	%g2, JUPITER_IMPL
+	bne	%xcc, 1f
+	  nop
+	RESET_SHARED_CTXT(%g2)
+1:
 	RESET_MMU_REGS(%g2, %g3, %g4)
 	ba	%xcc, opl_uger_panic
 	 nop
@@ -1495,6 +1539,12 @@
 	andcc	%g1, %g2, %g0
 	bz,pt	%xcc, opl_uger_pstate
 	 nop
+	GET_CPU_IMPL(%g2)
+	cmp	%g2, JUPITER_IMPL
+	bne	%xcc, 1f
+	  nop
+	RESET_TSB_PREFETCH(%g2)
+1:
 	RESET_TSB_TAGPTR(%g2)
 
 	/*
--- a/usr/src/uts/sun4u/io/opl_cfg.c	Wed Sep 12 19:25:16 2007 -0700
+++ b/usr/src/uts/sun4u/io/opl_cfg.c	Wed Sep 12 22:37:07 2007 -0700
@@ -146,7 +146,7 @@
 	 * Put the allocated memory into the pool.
 	 */
 	(void) ndi_ra_free(ddi_root_node(), (uint64_t)efcode_vaddr,
-		(uint64_t)efcode_size, "opl-fcodemem", 0);
+	    (uint64_t)efcode_size, "opl-fcodemem", 0);
 
 	if ((err = mod_install(&modlinkage)) != 0) {
 		cmn_err(CE_WARN, "opl_cfg failed to load, error=%d", err);
@@ -597,8 +597,8 @@
 	 * represent separate branches that must be managed.
 	 */
 	return ((strcmp(name, OPL_CPU_CHIP_NODE) == 0) ||
-		(strcmp(name, OPL_PSEUDO_MC_NODE) == 0) ||
-		(strcmp(name, OPL_PCI_LEAF_NODE) == 0));
+	    (strcmp(name, OPL_PSEUDO_MC_NODE) == 0) ||
+	    (strcmp(name, OPL_PCI_LEAF_NODE) == 0));
 }
 
 static int
@@ -724,8 +724,8 @@
 	if (e_ddi_branch_destroy(node, NULL, 0) != 0) {
 		char *path = kmem_alloc(MAXPATHLEN, KM_SLEEP);
 		(void) ddi_pathname(node, path);
-		cmn_err(CE_WARN, "OPL node removal failed: %s (%p)",
-			    path, (void *)node);
+		cmn_err(CE_WARN, "OPL node removal failed: %s (%p)", path,
+		    (void *)node);
 		kmem_free(path, MAXPATHLEN);
 		return (-1);
 	}
@@ -792,8 +792,8 @@
 		if (opl_create_node(probe) == NULL) {
 
 			cmn_err(CE_WARN, "IKP: create cpu (%d-%d-%d-%d) failed",
-				probe->pr_board, probe->pr_cpu_chip,
-				probe->pr_core, probe->pr_cpu);
+			    probe->pr_board, probe->pr_cpu_chip, probe->pr_core,
+			    probe->pr_cpu);
 			return (-1);
 		}
 	}
@@ -890,8 +890,8 @@
 		if (node == NULL) {
 
 			cmn_err(CE_WARN, "IKP: create core (%d-%d-%d) failed",
-				probe->pr_board, probe->pr_cpu_chip,
-				probe->pr_core);
+			    probe->pr_board, probe->pr_cpu_chip,
+			    probe->pr_core);
 			return (-1);
 		}
 
@@ -901,6 +901,7 @@
 		probe->pr_parent = node;
 		if (opl_probe_cpus(probe) != 0)
 			return (-1);
+		probe->pr_cpu_impl |= (1 << cores[i].core_implementation);
 	}
 
 	return (0);
@@ -973,7 +974,7 @@
 		if (node == NULL) {
 
 			cmn_err(CE_WARN, "IKP: create chip (%d-%d) failed",
-				probe->pr_board, probe->pr_cpu_chip);
+			    probe->pr_board, probe->pr_cpu_chip);
 			return (-1);
 		}
 
@@ -1074,7 +1075,7 @@
 
 	for (i = 0, j = 0; i < CS_PER_MEM; i++) {
 		if (HWD_STATUS_OK(mem->mem_cs[i].cs_status) ||
-			HWD_STATUS_FAILED(mem->mem_cs[i].cs_status)) {
+		    HWD_STATUS_FAILED(mem->mem_cs[i].cs_status)) {
 			status[j][0] = i;
 			if (HWD_STATUS_OK(mem->mem_cs[i].cs_status))
 				status[j][1] = 0;
@@ -1426,8 +1427,8 @@
 			    ((caddr_t)resp->fc_map_virt + resp->fc_map_len)))
 				break;
 		} else if (resp->type == RT_CONTIGIOUS) {
-		    if ((virt >= (caddr_t)resp->fc_contig_virt) && ((virt + len)
-			<= ((caddr_t)resp->fc_contig_virt +
+			if ((virt >= (caddr_t)resp->fc_contig_virt) &&
+			    ((virt + len) <= ((caddr_t)resp->fc_contig_virt +
 			    resp->fc_contig_len)))
 				break;
 		}
@@ -1442,32 +1443,32 @@
 	switch (len) {
 	case sizeof (x):
 		if (resp->type == RT_MAP)
-			error = ddi_peek64(rp->child,
-			(int64_t *)virt, (int64_t *)&x);
+			error = ddi_peek64(rp->child, (int64_t *)virt,
+			    (int64_t *)&x);
 		else /* RT_CONTIGIOUS */
 			x = *(int64_t *)virt;
 		v = x;
 		break;
 	case sizeof (l):
 		if (resp->type == RT_MAP)
-			error = ddi_peek32(rp->child,
-			(int32_t *)virt, (int32_t *)&l);
+			error = ddi_peek32(rp->child, (int32_t *)virt,
+			    (int32_t *)&l);
 		else /* RT_CONTIGIOUS */
 			l = *(int32_t *)virt;
 		v = l;
 		break;
 	case sizeof (w):
 		if (resp->type == RT_MAP)
-			error = ddi_peek16(rp->child,
-			(int16_t *)virt, (int16_t *)&w);
+			error = ddi_peek16(rp->child, (int16_t *)virt,
+			    (int16_t *)&w);
 		else /* RT_CONTIGIOUS */
 			w = *(int16_t *)virt;
 		v = w;
 		break;
 	case sizeof (b):
 		if (resp->type == RT_MAP)
-			error = ddi_peek8(rp->child,
-			(int8_t *)virt, (int8_t *)&b);
+			error = ddi_peek8(rp->child, (int8_t *)virt,
+			    (int8_t *)&b);
 		else /* RT_CONTIGIOUS */
 			b = *(int8_t *)virt;
 		v = b;
@@ -1559,8 +1560,8 @@
 			    ((caddr_t)resp->fc_map_virt + resp->fc_map_len)))
 				break;
 		} else if (resp->type == RT_CONTIGIOUS) {
-		    if ((virt >= (caddr_t)resp->fc_contig_virt) && ((virt + len)
-			<= ((caddr_t)resp->fc_contig_virt +
+			if ((virt >= (caddr_t)resp->fc_contig_virt) &&
+			    ((virt + len) <= ((caddr_t)resp->fc_contig_virt +
 			    resp->fc_contig_len)))
 				break;
 		}
@@ -2422,7 +2423,7 @@
 	if (leaf_node == NULL) {
 
 		cmn_err(CE_WARN, "IKP: create leaf (%d-%d-%d) failed",
-			probe->pr_board, probe->pr_channel, probe->pr_leaf);
+		    probe->pr_board, probe->pr_channel, probe->pr_leaf);
 		ndi_devi_exit(parent, circ);
 		return (-1);
 	}
@@ -2468,7 +2469,7 @@
 
 	if (error != 0) {
 		cmn_err(CE_WARN, "IKP: Unable to probe PCI leaf (%d-%d-%d)",
-			probe->pr_board, probe->pr_channel, probe->pr_leaf);
+		    probe->pr_board, probe->pr_channel, probe->pr_leaf);
 
 		opl_fc_ops_free_handle(fco_handle);
 
@@ -2498,12 +2499,10 @@
 
 		ndi_devi_exit(parent, circ);
 
-		if (ndi_devi_bind_driver(leaf_node, 0) !=
-			DDI_SUCCESS) {
-			cmn_err(CE_WARN,
-				"IKP: Unable to bind PCI leaf (%d-%d-%d)",
-				probe->pr_board, probe->pr_channel,
-				probe->pr_leaf);
+		if (ndi_devi_bind_driver(leaf_node, 0) != DDI_SUCCESS) {
+			cmn_err(CE_WARN, "IKP: Unable to bind PCI leaf "
+			    "(%d-%d-%d)", probe->pr_board, probe->pr_channel,
+			    probe->pr_leaf);
 		}
 	}
 
@@ -2529,9 +2528,8 @@
 	 */
 	ndi_devi_enter(parent, &circ);
 
-	for (node = ddi_get_child(parent);
-		(node != NULL);
-		node = ddi_get_next_sibling(node)) {
+	for (node = ddi_get_child(parent); (node != NULL); node =
+	    ddi_get_next_sibling(node)) {
 
 		ret = OPL_GET_PROP(string, node, "name", &name, &len);
 		if (ret != DDI_PROP_SUCCESS) {
@@ -2564,10 +2562,10 @@
 				} else {
 
 					leaf = OPL_PORTID_TO_LEAF(portid);
-					if (cfg->cfg_pcich_handle
-						[channel][leaf] != NULL)
-						cfg->cfg_pcich_leaf
-							[channel][leaf] = node;
+					if (cfg->cfg_pcich_handle[
+					    channel][leaf] != NULL)
+						cfg->cfg_pcich_leaf[
+						    channel][leaf] = node;
 				}
 			}
 		}
@@ -2618,7 +2616,7 @@
 
 			probe->pr_leaf = j;
 			probe->pr_leaf_status =
-				channels[i].pci_leaf[j].leaf_status;
+			    channels[i].pci_leaf[j].leaf_status;
 
 			if (!HWD_STATUS_OK(probe->pr_leaf_status))
 				continue;
@@ -2646,7 +2644,7 @@
  * the whole probe operation to fail.
  */
 int
-opl_probe_sb(int board)
+opl_probe_sb(int board, unsigned *cpu_impl)
 {
 	opl_probe_t	*probe;
 	int		ret;
@@ -2684,6 +2682,8 @@
 		ret = -1;
 	}
 
+	*cpu_impl = probe->pr_cpu_impl;
+
 	kmem_free(probe, sizeof (opl_probe_t));
 
 	return (ret);
@@ -2728,9 +2728,8 @@
 			ret = opl_destroy_node(*node);
 			if (ret != 0) {
 
-				cmn_err(CE_WARN,
-					"IKP: destroy pci (%d-%d-%d) failed",
-					board, i, j);
+				cmn_err(CE_WARN, "IKP: destroy pci (%d-%d-%d) "
+				    "failed", board, i, j);
 				return (-1);
 			}
 
@@ -2758,8 +2757,8 @@
 
 	if (opl_destroy_node(*node) != 0) {
 
-		cmn_err(CE_WARN, "IKP: destroy pci (%d-%d-%d) failed",
-			board, OPL_CMU_CHANNEL, 0);
+		cmn_err(CE_WARN, "IKP: destroy pci (%d-%d-%d) failed", board,
+		    OPL_CMU_CHANNEL, 0);
 		return (-1);
 	}
 
@@ -2811,8 +2810,8 @@
 
 		if (opl_destroy_node(cfg_cpu_chips[i]) != 0) {
 
-			cmn_err(CE_WARN,
-				"IKP: destroy chip (%d-%d) failed", board, i);
+			cmn_err(CE_WARN, "IKP: destroy chip (%d-%d) failed",
+			    board, i);
 			return (-1);
 		}
 
--- a/usr/src/uts/sun4u/ngdr/io/dr_cpu.c	Wed Sep 12 19:25:16 2007 -0700
+++ b/usr/src/uts/sun4u/ngdr/io/dr_cpu.c	Wed Sep 12 22:37:07 2007 -0700
@@ -163,8 +163,8 @@
 	 * If the property is not found in the CPU node, it has to be
 	 * kept in the core or cmp node so we just keep looking.
 	 */
-	clock_freq = (unsigned int)ddi_prop_get_int(DDI_DEV_T_ANY,
-		dip, 0, "clock-frequency", 0);
+	clock_freq = (unsigned int)ddi_prop_get_int(DDI_DEV_T_ANY, dip, 0,
+	    "clock-frequency", 0);
 
 	ASSERT(clock_freq != 0);
 
@@ -181,6 +181,7 @@
 		break;
 	case JAGUAR_IMPL:
 	case OLYMPUS_C_IMPL:
+	case JUPITER_IMPL:
 		cache_str = "l2-cache-size";
 		break;
 	case PANTHER_IMPL:
@@ -201,8 +202,8 @@
 		 * we just keep looking.
 		 */
 
-		ecache_size = ddi_prop_get_int(DDI_DEV_T_ANY,
-			dip, 0, cache_str, 0);
+		ecache_size = ddi_prop_get_int(DDI_DEV_T_ANY, dip, 0,
+		    cache_str, 0);
 	}
 
 	ASSERT(ecache_size != 0);
@@ -293,7 +294,7 @@
 		 * many cores are actually present.
 		 */
 		curr_cpu = DR_UNUM2SBD_UNUM(up->sbc_cm.sbdev_unum,
-			SBD_COMP_CPU);
+		    SBD_COMP_CPU);
 		if (curr_cpu >= next_cpu) {
 			cmn_err(CE_CONT, "OS configure %s",
 			    up->sbc_cm.sbdev_path);
@@ -307,8 +308,8 @@
 			 * still be mapped in.  Need to unmap it
 			 * before continuing with attachment.
 			 */
-			PR_CPU("%s: unmapping sigblk for cpu %d\n",
-				f, up->sbc_cpu_id);
+			PR_CPU("%s: unmapping sigblk for cpu %d\n", f,
+			    up->sbc_cpu_id);
 
 			CPU_SGN_MAPOUT(up->sbc_cpu_id);
 		}
@@ -434,7 +435,7 @@
 
 	/* allocate status struct storage. */
 	ds = (sbd_dev_stat_t *) kmem_zalloc(sizeof (sbd_dev_stat_t) *
-		MAX_CPU_UNITS_PER_BOARD, KM_SLEEP);
+	    MAX_CPU_UNITS_PER_BOARD, KM_SLEEP);
 
 	cix = dr_cpu_status(hp, devset, ds);
 
@@ -455,8 +456,8 @@
 		for (c = 0; c < cix; c++) {
 			if (ds[c].d_cpu.cs_unit == up->sbc_cm.sbdev_unum) {
 				if (ds[c].d_cpu.cs_busy) {
-					dr_dev_err(CE_WARN,
-						&up->sbc_cm, ESBD_BUSY);
+					dr_dev_err(CE_WARN, &up->sbc_cm,
+					    ESBD_BUSY);
 					rv = -1;
 					break;
 				}
@@ -480,13 +481,12 @@
 
 			PR_CPU("%s: offlining cpu %d\n", f, cpuid);
 			if (cpu_offline(cp, cpu_flags)) {
-				PR_CPU("%s: failed to offline cpu %d\n",
-					f, cpuid);
+				PR_CPU("%s: failed to offline cpu %d\n", f,
+				    cpuid);
 				dr_dev_err(CE_WARN, &up->sbc_cm, ESBD_OFFLINE);
 				if (disp_bound_threads(cp, 0)) {
-					cmn_err(CE_WARN, "%s: thread(s) "
-						"bound to cpu %d",
-							f, cp->cpu_id);
+					cmn_err(CE_WARN, "%s: thread(s) bound "
+					    "to cpu %d", f, cp->cpu_id);
 				}
 				rv = -1;
 				break;
@@ -567,7 +567,7 @@
 		 * many cores are actually present.
 		 */
 		curr_cpu = DR_UNUM2SBD_UNUM(up->sbc_cm.sbdev_unum,
-			SBD_COMP_CPU);
+		    SBD_COMP_CPU);
 		if (curr_cpu >= next_cpu) {
 			cmn_err(CE_CONT, "OS unconfigure %s\n",
 			    up->sbc_cm.sbdev_path);
@@ -593,9 +593,8 @@
 				    f, up->sbc_cpu_id);
 				dr_dev_err(CE_WARN, &up->sbc_cm, ESBD_OFFLINE);
 				if (disp_bound_threads(cp, 0)) {
-					cmn_err(CE_WARN, "%s: thread(s) "
-						"bound to cpu %d",
-							f, cp->cpu_id);
+					cmn_err(CE_WARN, "%s: thread(s) bound "
+					    "to cpu %d", f, cp->cpu_id);
 				}
 				goto err;
 			}
@@ -735,8 +734,8 @@
 		 * The following properties should be the same
 		 * for all the cores of the CMP.
 		 */
-		ASSERT(psp->ps_unit == DR_UNUM2SBD_UNUM(
-			csp[core].cs_unit, SBD_COMP_CMP));
+		ASSERT(psp->ps_unit == DR_UNUM2SBD_UNUM(csp[core].cs_unit,
+		    SBD_COMP_CMP));
 		ASSERT(psp->ps_speed == csp[core].cs_speed);
 
 		psp->ps_cpuid[core] = csp[core].cs_cpuid;
@@ -884,8 +883,7 @@
 		 * CPU had been online, go ahead
 		 * bring it back online.
 		 */
-		PR_CPU("%s: bringing cpu %d back ONLINE\n",
-			f, up->sbc_cpu_id);
+		PR_CPU("%s: bringing cpu %d back ONLINE\n", f, up->sbc_cpu_id);
 
 		mutex_enter(&cpu_lock);
 		cp = cpu[up->sbc_cpu_id];
@@ -910,8 +908,8 @@
 			if (cpu_flagged_nointr(up->sbc_cpu_flags)) {
 				if (cpu_intr_disable(cp) != 0) {
 					cmn_err(CE_WARN, "%s: failed to "
-					"disable interrupts on cpu %d",
-						f, up->sbc_cpu_id);
+					    "disable interrupts on cpu %d", f,
+					    up->sbc_cpu_id);
 				}
 			}
 		}
@@ -931,7 +929,7 @@
 	PR_CPU("%s...\n", f);
 
 	ASSERT((up->sbc_cm.sbdev_state == DR_STATE_CONNECTED) ||
-		(up->sbc_cm.sbdev_state == DR_STATE_UNCONFIGURED));
+	    (up->sbc_cm.sbdev_state == DR_STATE_UNCONFIGURED));
 
 	ASSERT(dr_cpu_unit_is_sane(up->sbc_cm.sbdev_bp, up));
 
@@ -940,8 +938,7 @@
 		 * Cpus were never brought in and so are still
 		 * effectively disconnected, so nothing to do here.
 		 */
-		PR_CPU("%s: cpu %d never brought in\n",
-			f, up->sbc_cpu_id);
+		PR_CPU("%s: cpu %d never brought in\n", f, up->sbc_cpu_id);
 		return (0);
 	}
 
--- a/usr/src/uts/sun4u/opl/Makefile.opl.shared	Wed Sep 12 19:25:16 2007 -0700
+++ b/usr/src/uts/sun4u/opl/Makefile.opl.shared	Wed Sep 12 22:37:07 2007 -0700
@@ -136,7 +136,7 @@
 # Maximum CPUID  =   01111 11 01 1 = 0x1FB (507)
 # Maximum CHIPID = 1 01111 11 00 0 = 0x5F8 (1528)
 #
-MACHINE_DEFS	+= -DNCPU=508
+MACHINE_DEFS	+= -DNCPU=512
 MACHINE_DEFS	+= -DMAX_CPU_CHIPID=1529
 MACHINE_DEFS	+= -DMAX_UPA=256
 MACHINE_DEFS	+= -DIGN_SIZE=8
--- a/usr/src/uts/sun4u/opl/io/drmach.c	Wed Sep 12 19:25:16 2007 -0700
+++ b/usr/src/uts/sun4u/opl/io/drmach.c	Wed Sep 12 22:37:07 2007 -0700
@@ -70,6 +70,7 @@
 #include <sys/ontrap.h>
 #include <sys/cpu_sgnblk_defs.h>
 #include <sys/opl.h>
+#include <sys/cpu_impl.h>
 
 
 #include <sys/promimpl.h>
@@ -377,9 +378,9 @@
 	hwd_memory_t *pm;
 
 	len = sizeof (memory_ranges);
-	if (ddi_getlongprop_buf(DDI_DEV_T_ANY, dip,
-		DDI_PROP_DONTPASS, "sb-mem-ranges",
-	    (caddr_t)&memory_ranges[0], &len) != DDI_PROP_SUCCESS) {
+	if (ddi_getlongprop_buf(DDI_DEV_T_ANY, dip, DDI_PROP_DONTPASS,
+	    "sb-mem-ranges", (caddr_t)&memory_ranges[0], &len) !=
+	    DDI_PROP_SUCCESS) {
 		mp->slice_base = 0;
 		mp->slice_size = 0;
 		return (-1);
@@ -401,8 +402,8 @@
 		for (i = 0; i < HWD_MAX_MEM_CHUNKS; i++) {
 			if (pm->mem_chunks[i].chnk_size > 0) {
 				ml = memlist_add_span(ml,
-					pm->mem_chunks[i].chnk_start_address,
-					pm->mem_chunks[i].chnk_size);
+				    pm->mem_chunks[i].chnk_start_address,
+				    pm->mem_chunks[i].chnk_size);
 			}
 		}
 	} else {
@@ -628,8 +629,8 @@
 	for (i = 0; i < OPL_MAX_COREID_PER_BOARD; i++) {
 		if (obj->boot_board) {
 			obj->cores[i].core_hotadded =
-				obj->cores[i].core_started =
-				obj->cores[i].core_present;
+			    obj->cores[i].core_started =
+			    obj->cores[i].core_present;
 		}
 	}
 }
@@ -695,8 +696,7 @@
 	/*
 	 * Root node doesn't have to be held in any way.
 	 */
-	ddi_walk_devs(ddi_root_node(), drmach_node_ddi_walk_cb,
-		(void *)&nargs);
+	ddi_walk_devs(ddi_root_node(), drmach_node_ddi_walk_cb, (void *)&nargs);
 
 	return (nargs.err);
 }
@@ -797,8 +797,8 @@
 	ndip = np->n_getdip(np);
 	if (ndip == NULL) {
 		rv = -1;
-	} else if (ddi_getproplen(DDI_DEV_T_ANY, ndip, DDI_PROP_DONTPASS,
-		name, len) != DDI_PROP_SUCCESS) {
+	} else if (ddi_getproplen(DDI_DEV_T_ANY, ndip, DDI_PROP_DONTPASS, name,
+	    len) != DDI_PROP_SUCCESS) {
 		rv = -1;
 	}
 
@@ -981,9 +981,8 @@
 	rv = node->n_getprop(node, "name", name, OBP_MAXDRVNAME);
 	if (rv) {
 		/* every node is expected to have a name */
-		err = drerr_new(1, EOPL_GETPROP,
-			"device node %s: property %s",
-			ddi_node_name(node->n_getdip(node)), "name");
+		err = drerr_new(1, EOPL_GETPROP, "device node %s: property %s",
+		    ddi_node_name(node->n_getdip(node)), "name");
 		return (err);
 	}
 
@@ -1142,13 +1141,13 @@
 	rdip = ddi_root_node();
 
 	if (ddi_getproplen(DDI_DEV_T_ANY, rdip, DDI_PROP_DONTPASS,
-		"floating-boards", &len) != DDI_PROP_SUCCESS) {
+	    "floating-boards", &len) != DDI_PROP_SUCCESS) {
 		cmn_err(CE_WARN, "Cannot get floating-boards proplen\n");
 	} else {
 		floating = (int *)kmem_alloc(len, KM_SLEEP);
-		rv = ddi_prop_op(DDI_DEV_T_ANY, rdip,
-			PROP_LEN_AND_VAL_BUF, DDI_PROP_DONTPASS,
-			"floating-boards", (caddr_t)floating, &len);
+		rv = ddi_prop_op(DDI_DEV_T_ANY, rdip, PROP_LEN_AND_VAL_BUF,
+		    DDI_PROP_DONTPASS, "floating-boards", (caddr_t)floating,
+		    &len);
 		if (rv != DDI_PROP_SUCCESS) {
 			cmn_err(CE_WARN, "Cannot get floating-boards prop\n");
 		} else {
@@ -1167,15 +1166,14 @@
 		drmachid_t	 id;
 
 		bnum = -1;
-		bnum = ddi_getprop(DDI_DEV_T_ANY, rdip,
-			DDI_PROP_DONTPASS, OBP_BOARDNUM, -1);
+		bnum = ddi_getprop(DDI_DEV_T_ANY, rdip, DDI_PROP_DONTPASS,
+		    OBP_BOARDNUM, -1);
 		if (bnum == -1)
 			continue;
 
 		if (drmach_array_get(drmach_boards, bnum, &id) == -1) {
-			cmn_err(CE_WARN, "Device node 0x%p has"
-				" invalid property value, %s=%d",
-					rdip, OBP_BOARDNUM, bnum);
+			cmn_err(CE_WARN, "Device node 0x%p has invalid "
+			    "property value, %s=%d", rdip, OBP_BOARDNUM, bnum);
 			goto error;
 		} else if (id == NULL) {
 			(void) drmach_board_new(bnum, 1);
@@ -1274,7 +1272,7 @@
 	ip->leaf = (portid & 0x1);
 
 	snprintf(ip->dev.cm.name, sizeof (ip->dev.cm.name), "%s%d",
-		ip->dev.type, ip->dev.unum);
+	    ip->dev.type, ip->dev.unum);
 
 	*idp = (drmachid_t)ip;
 	return (NULL);
@@ -1330,20 +1328,17 @@
 				if (bp->connected)
 					err = drerr_new(0, ESBD_STATE, NULL);
 				else if (!drmach_domain.allow_dr)
-					err = drerr_new(1, EOPL_SUPPORT,
-						NULL);
+					err = drerr_new(1, EOPL_SUPPORT, NULL);
 				break;
 			case SBD_CMD_DISCONNECT:
 				if (!bp->connected)
 					err = drerr_new(0, ESBD_STATE, NULL);
 				else if (!drmach_domain.allow_dr)
-					err = drerr_new(1, EOPL_SUPPORT,
-						NULL);
+					err = drerr_new(1, EOPL_SUPPORT, NULL);
 				break;
 			default:
 				if (!drmach_domain.allow_dr)
-					err = drerr_new(1, EOPL_SUPPORT,
-						NULL);
+					err = drerr_new(1, EOPL_SUPPORT, NULL);
 				break;
 
 		}
@@ -1377,7 +1372,7 @@
 		bp = *id;
 		if (!(*id))
 			bp = *id  =
-				(drmachid_t)drmach_board_new(bnum, 0);
+			    (drmachid_t)drmach_board_new(bnum, 0);
 		bp->assigned = 1;
 	}
 
@@ -1390,14 +1385,21 @@
 sbd_error_t *
 drmach_board_connect(drmachid_t id, drmach_opts_t *opts)
 {
+	extern int	cpu_alljupiter;
 	drmach_board_t	*obj = (drmach_board_t *)id;
+	unsigned	cpu_impl;
 
 	if (!DRMACH_IS_BOARD_ID(id))
 		return (drerr_new(0, EOPL_INAPPROP, NULL));
 
-	if (opl_probe_sb(obj->bnum) != 0)
+	if (opl_probe_sb(obj->bnum, &cpu_impl) != 0)
 		return (drerr_new(1, EOPL_PROBE, NULL));
 
+	if (cpu_alljupiter) {
+		if (cpu_impl & (1 << OLYMPUS_C_IMPL))
+			return (drerr_new(1, EOPL_MIXED_CPU, NULL));
+	}
+
 	(void) prom_attach_notice(obj->bnum);
 
 	drmach_setup_core_info(obj);
@@ -1445,18 +1447,18 @@
 	bnum = bp->bnum;
 
 	for (i = 0; i < OPL_MAX_COREID_PER_BOARD; i++) {
-	    if (bp->cores[i].core_present) {
-		if (bp->cores[i].core_started)
-		    return (-1);
-		if (bp->cores[i].core_hotadded) {
-		    if (drmach_add_remove_cpu(bnum, i, HOTREMOVE_CPU)) {
-			cmn_err(CE_WARN,
-			    "Failed to remove CMP %d on board %d\n",
-			    i, bnum);
-			return (-1);
-		    }
+		if (bp->cores[i].core_present) {
+			if (bp->cores[i].core_started)
+				return (-1);
+			if (bp->cores[i].core_hotadded) {
+				if (drmach_add_remove_cpu(bnum, i,
+				    HOTREMOVE_CPU)) {
+					cmn_err(CE_WARN, "Failed to remove "
+					    "CMP %d on board %d\n", i, bnum);
+					return (-1);
+				}
+			}
 		}
-	    }
 	}
 	return (0);
 }
@@ -1821,9 +1823,9 @@
 
 	/* unum = (CMP/CHIP ID) + (ON_BOARD_CORE_NUM * MAX_CMPID_PER_BOARD) */
 	proto->unum = ((portid/OPL_MAX_CPUID_PER_CMP) &
-		(OPL_MAX_CMPID_PER_BOARD - 1)) +
-		((portid & (OPL_MAX_CPUID_PER_CMP - 1)) *
-		(OPL_MAX_CMPID_PER_BOARD));
+	    (OPL_MAX_CMPID_PER_BOARD - 1)) +
+	    ((portid & (OPL_MAX_CPUID_PER_CMP - 1)) *
+	    (OPL_MAX_CMPID_PER_BOARD));
 
 	cp = kmem_zalloc(sizeof (drmach_cpu_t), KM_SLEEP);
 	bcopy(proto, &cp->dev, sizeof (cp->dev));
@@ -1834,7 +1836,7 @@
 	cp->dev.cm.status = drmach_cpu_status;
 
 	snprintf(cp->dev.cm.name, sizeof (cp->dev.cm.name), "%s%d",
-		cp->dev.type, cp->dev.unum);
+	    cp->dev.type, cp->dev.unum);
 
 /*
  *	CPU ID representation
@@ -1979,8 +1981,8 @@
 	}
 
 	if (strcmp(type, OPL_CORE_NODE) == 0) {
-		if (pp.n_getprop(&pp, "implementation#",
-			&impl, sizeof (impl)) != 0) {
+		if (pp.n_getprop(&pp, "implementation#", &impl,
+		    sizeof (impl)) != 0) {
 			return (drerr_new(0, EOPL_GETPROP, NULL));
 		}
 	} else {
@@ -2046,8 +2048,7 @@
 	char name[OBP_MAXDRVNAME];
 	int len = OBP_MAXDRVNAME;
 
-	if (ddi_getlongprop_buf(DDI_DEV_T_ANY, dip,
-		DDI_PROP_DONTPASS, "name",
+	if (ddi_getlongprop_buf(DDI_DEV_T_ANY, dip, DDI_PROP_DONTPASS, "name",
 	    (caddr_t)name, &len) != DDI_PROP_SUCCESS) {
 		return (DDI_WALK_PRUNECHILD);
 	}
@@ -2217,7 +2218,7 @@
 	rv = 0;
 
 	if ((proto->node->n_getproplen(proto->node, "mc-addr", &rv) < 0) ||
-		(rv <= 0)) {
+	    (rv <= 0)) {
 		*idp = (drmachid_t)0;
 		return (NULL);
 	}
@@ -2232,8 +2233,7 @@
 	mp->dev.cm.release = drmach_mem_release;
 	mp->dev.cm.status = drmach_mem_status;
 
-	snprintf(mp->dev.cm.name,
-		sizeof (mp->dev.cm.name), "%s", mp->dev.type);
+	snprintf(mp->dev.cm.name, sizeof (mp->dev.cm.name), "%s", mp->dev.type);
 
 	dip = mp->dev.node->n_getdip(mp->dev.node);
 	if (drmach_setup_mc_info(dip, mp) != 0) {
@@ -2286,13 +2286,13 @@
 	rv = kcage_range_add(basepfn, npages, KCAGE_DOWN);
 	if (rv == ENOMEM) {
 		cmn_err(CE_WARN, "%ld megabytes not available to kernel cage",
-			(size == 0 ? 0 : size / MBYTE));
+		    (size == 0 ? 0 : size / MBYTE));
 	} else if (rv != 0) {
 		/* catch this in debug kernels */
 		ASSERT(0);
 
-		cmn_err(CE_WARN, "unexpected kcage_range_add"
-			" return value %d", rv);
+		cmn_err(CE_WARN, "unexpected kcage_range_add return value %d",
+		    rv);
 	}
 
 	if (rv) {
@@ -2406,8 +2406,7 @@
 	rv = memlist_intersect(phys_install, mlist);
 	memlist_read_unlock();
 	if (rv) {
-		DRMACH_PR("Derived memlist intersects"
-			" with phys_install\n");
+		DRMACH_PR("Derived memlist intersects with phys_install\n");
 		memlist_dump(mlist);
 
 		DRMACH_PR("phys_install memlist:\n");
@@ -2524,12 +2523,13 @@
 	drmach_board_t		*bp = (drmach_board_t *)id;
 	sbd_error_t		*err = NULL;
 	int	rv;
+	unsigned cpu_impl;
 
 	if (!DRMACH_IS_BOARD_ID(id))
 		return (drerr_new(0, EOPL_INAPPROP, NULL));
 
 	DRMACH_PR("calling opl_probe_board for bnum=%d\n", bp->bnum);
-	rv = opl_probe_sb(bp->bnum);
+	rv = opl_probe_sb(bp->bnum, &cpu_impl);
 	if (rv != 0) {
 		err = drerr_new(1, EOPL_PROBE, bp->cm.name);
 		return (err);
@@ -2749,9 +2749,9 @@
 	ASSERT(bp);
 	if (bp->cores[onb_core_num].core_hotadded == 0) {
 		if (drmach_add_remove_cpu(bnum, onb_core_num,
-			HOTADD_CPU) != 0) {
+		    HOTADD_CPU) != 0) {
 			cmn_err(CE_WARN, "Failed to add CMP %d on board %d\n",
-				onb_core_num, bnum);
+			    onb_core_num, bnum);
 			return (EIO);
 		}
 	}
@@ -2766,10 +2766,9 @@
 			 * drmach_board_disconnect.
 			 */
 			if (drmach_add_remove_cpu(bnum, onb_core_num,
-				HOTREMOVE_CPU) != 0) {
+			    HOTREMOVE_CPU) != 0) {
 				cmn_err(CE_WARN, "Failed to remove CMP %d "
-					"on board %d\n",
-					onb_core_num, bnum);
+				    "on board %d\n", onb_core_num, bnum);
 			}
 		}
 		return (EBUSY);
@@ -2830,10 +2829,9 @@
 		bp->cores[onb_core_num].core_started &= ~(1 << strand_id);
 		if (bp->cores[onb_core_num].core_started == 0) {
 			if (drmach_add_remove_cpu(bnum, onb_core_num,
-				HOTREMOVE_CPU) != 0) {
-				cmn_err(CE_WARN,
-					"Failed to remove CMP %d LSB %d\n",
-					onb_core_num, bnum);
+			    HOTREMOVE_CPU) != 0) {
+				cmn_err(CE_WARN, "Failed to remove CMP %d LSB "
+				    "%d\n", onb_core_num, bnum);
 				return (EIO);
 			}
 		}
@@ -2881,24 +2879,24 @@
 	}
 	if (verbose) {
 		DRMACH_PR("drmach_log_sysevent: %s %s, flag: %d, verbose: %d\n",
-			attach_pnt, hint, flag, verbose);
+		    attach_pnt, hint, flag, verbose);
 	}
 
 	if ((ev = sysevent_alloc(EC_DR, ESC_DR_AP_STATE_CHANGE,
-		SUNW_KERN_PUB"dr", km_flag)) == NULL) {
+	    SUNW_KERN_PUB"dr", km_flag)) == NULL) {
 		rv = -2;
 		goto logexit;
 	}
 	evnt_val.value_type = SE_DATA_TYPE_STRING;
 	evnt_val.value.sv_string = attach_pnt;
-	if ((rv = sysevent_add_attr(&evnt_attr_list, DR_AP_ID,
-		&evnt_val, km_flag)) != 0)
+	if ((rv = sysevent_add_attr(&evnt_attr_list, DR_AP_ID, &evnt_val,
+	    km_flag)) != 0)
 		goto logexit;
 
 	evnt_val.value_type = SE_DATA_TYPE_STRING;
 	evnt_val.value.sv_string = hint;
-	if ((rv = sysevent_add_attr(&evnt_attr_list, DR_HINT,
-		&evnt_val, km_flag)) != 0) {
+	if ((rv = sysevent_add_attr(&evnt_attr_list, DR_HINT, &evnt_val,
+	    km_flag)) != 0) {
 		sysevent_free_attr(evnt_attr_list);
 		goto logexit;
 	}
@@ -2915,9 +2913,8 @@
 	if (ev)
 		sysevent_free(ev);
 	if ((rv != 0) && verbose)
-		cmn_err(CE_WARN,
-			"drmach_log_sysevent failed (rv %d) for %s  %s\n",
-			rv, attach_pnt, hint);
+		cmn_err(CE_WARN, "drmach_log_sysevent failed (rv %d) for %s "
+		    " %s\n", rv, attach_pnt, hint);
 
 	return (rv);
 }
@@ -2994,17 +2991,15 @@
 				if (mlist == ml)
 					mlist = nl;
 			} else {
-				ml->size = MAX((base + len),
-					(ml->address + ml->size)) -
-					base;
+				ml->size = MAX((base + len), (ml->address +
+				    ml->size)) - base;
 				ml->address = base;
 			}
 			break;
 
 		} else if (base <= (ml->address + ml->size)) {
-			ml->size = MAX((base + len),
-				(ml->address + ml->size)) -
-				MIN(ml->address, base);
+			ml->size = MAX((base + len), (ml->address + ml->size)) -
+			    MIN(ml->address, base);
 			ml->address = MIN(ml->address, base);
 			break;
 		}
@@ -3147,20 +3142,20 @@
 		limit += cpu_xcall_delay * system_clock_freq;
 		for (i = 0; i < NCPU; i++) {
 			if (CPU_IN_SET(prog->data->cpu_slave_set, i)) {
-			/* wait for all CPU's to be ready */
-			    for (;;) {
-				if (prog->critical->stat[i] ==
-					FMEM_LOOP_COPY_READY) {
-					break;
+				/* wait for all CPU's to be ready */
+				for (;;) {
+					if (prog->critical->stat[i] ==
+					    FMEM_LOOP_COPY_READY) {
+						break;
+					}
+					DR_DELAY_IL(1, prog->data->stick_freq);
 				}
-				DR_DELAY_IL(1, prog->data->stick_freq);
-			    }
-			    curr = drmach_get_stick_il();
-			    if (curr > limit) {
-				prog->data->fmem_status.error =
-					EOPL_FMEM_XC_TIMEOUT;
-				return (EOPL_FMEM_XC_TIMEOUT);
-			    }
+				curr = drmach_get_stick_il();
+				if (curr > limit) {
+					prog->data->fmem_status.error =
+					    EOPL_FMEM_XC_TIMEOUT;
+					return (EOPL_FMEM_XC_TIMEOUT);
+				}
 			}
 		}
 		prog->data->fmem_status.stat = FMEM_LOOP_COPY_READY;
@@ -3169,12 +3164,11 @@
 	} else {
 		for (;;) {
 			if (prog->data->fmem_status.stat ==
-				FMEM_LOOP_COPY_READY) {
+			    FMEM_LOOP_COPY_READY) {
 				break;
 			}
 			if (prog->data->fmem_status.error) {
-				prog->data->error[cpuid] =
-					EOPL_FMEM_TERMINATE;
+				prog->data->error[cpuid] = EOPL_FMEM_TERMINATE;
 				return (EOPL_FMEM_TERMINATE);
 			}
 			DR_DELAY_IL(1, prog->data->stick_freq);
@@ -3185,51 +3179,58 @@
 	 * DO COPY.
 	 */
 	if (CPU_IN_SET(prog->data->cpu_copy_set, cpuid)) {
-	    for (ml = prog->data->cpu_ml[cpuid]; ml; ml = ml->next) {
-		uint64_t	s_pa, t_pa;
-		uint64_t	nbytes;
-
-		s_pa = prog->data->s_copybasepa + ml->address;
-		t_pa = prog->data->t_copybasepa + ml->address;
-		nbytes = ml->size;
-
-		while (nbytes != 0ull) {
-			/* If the master has detected error, we just bail out */
-			if (prog->data->fmem_status.error != ESBD_NOERROR) {
-				prog->data->error[cpuid] =
-					EOPL_FMEM_TERMINATE;
-				return (EOPL_FMEM_TERMINATE);
+		for (ml = prog->data->cpu_ml[cpuid]; ml; ml = ml->next) {
+			uint64_t	s_pa, t_pa;
+			uint64_t	nbytes;
+
+			s_pa = prog->data->s_copybasepa + ml->address;
+			t_pa = prog->data->t_copybasepa + ml->address;
+			nbytes = ml->size;
+
+			while (nbytes != 0ull) {
+				/*
+				 * If the master has detected error, we just
+				 * bail out
+				 */
+				if (prog->data->fmem_status.error !=
+				    ESBD_NOERROR) {
+					prog->data->error[cpuid] =
+					    EOPL_FMEM_TERMINATE;
+					return (EOPL_FMEM_TERMINATE);
+				}
+				/*
+				 * This copy does NOT use an ASI
+				 * that avoids the Ecache, therefore
+				 * the dst_pa addresses may remain
+				 * in our Ecache after the dst_pa
+				 * has been removed from the system.
+				 * A subsequent write-back to memory
+				 * will cause an ARB-stop because the
+				 * physical address no longer exists
+				 * in the system. Therefore we must
+				 * flush out local Ecache after we
+				 * finish the copy.
+				 */
+
+				/* copy 32 bytes at src_pa to dst_pa */
+				bcopy32_il(s_pa, t_pa);
+
+				/*
+				 * increment the counter to signal that we are
+				 * alive
+				 */
+				prog->stat->nbytes[cpuid] += 32;
+
+				/* increment by 32 bytes */
+				s_pa += (4 * sizeof (uint64_t));
+				t_pa += (4 * sizeof (uint64_t));
+
+				/* decrement by 32 bytes */
+				nbytes -= (4 * sizeof (uint64_t));
 			}
-			/*
-			 * This copy does NOT use an ASI
-			 * that avoids the Ecache, therefore
-			 * the dst_pa addresses may remain
-			 * in our Ecache after the dst_pa
-			 * has been removed from the system.
-			 * A subsequent write-back to memory
-			 * will cause an ARB-stop because the
-			 * physical address no longer exists
-			 * in the system. Therefore we must
-			 * flush out local Ecache after we
-			 * finish the copy.
-			 */
-
-			/* copy 32 bytes at src_pa to dst_pa */
-			bcopy32_il(s_pa, t_pa);
-
-			/* increment the counter to signal that we are alive */
-			prog->stat->nbytes[cpuid] += 32;
-
-			/* increment by 32 bytes */
-			s_pa += (4 * sizeof (uint64_t));
-			t_pa += (4 * sizeof (uint64_t));
-
-			/* decrement by 32 bytes */
-			nbytes -= (4 * sizeof (uint64_t));
 		}
-	    }
-	    prog->critical->stat[cpuid] = FMEM_LOOP_COPY_DONE;
-	    membar_sync_il();
+		prog->critical->stat[cpuid] = FMEM_LOOP_COPY_DONE;
+		membar_sync_il();
 	}
 
 	/*
@@ -3247,28 +3248,35 @@
 
 		limit = copy_start + prog->data->copy_delay;
 		for (i = 0; i < NCPU; i++) {
-			if (CPU_IN_SET(prog->data->cpu_slave_set, i)) {
-			    for (;;) {
-				/* we get FMEM_LOOP_FMEM_READY in normal case */
+			if (!CPU_IN_SET(prog->data->cpu_slave_set, i))
+				continue;
+
+			for (;;) {
+				/*
+				 * we get FMEM_LOOP_FMEM_READY in
+				 * normal case
+				 */
 				if (prog->critical->stat[i] ==
-					FMEM_LOOP_FMEM_READY) {
+				    FMEM_LOOP_FMEM_READY) {
 					break;
 				}
 				/* got error traps */
 				if (prog->data->error[i] ==
-					EOPL_FMEM_COPY_ERROR) {
+				    EOPL_FMEM_COPY_ERROR) {
 					prog->data->fmem_status.error =
-						EOPL_FMEM_COPY_ERROR;
+					    EOPL_FMEM_COPY_ERROR;
 					return (EOPL_FMEM_COPY_ERROR);
 				}
-				/* if we have not reached limit, wait more */
+				/*
+				 * if we have not reached limit, wait
+				 * more
+				 */
 				curr = drmach_get_stick_il();
 				if (curr <= limit)
 					continue;
 
 				prog->data->slowest_cpuid = i;
-				prog->data->copy_wait_time =
-					curr - copy_start;
+				prog->data->copy_wait_time = curr - copy_start;
 
 				/* now check if slave is alive */
 				last = prog->stat->nbytes[i];
@@ -3277,23 +3285,25 @@
 
 				now = prog->stat->nbytes[i];
 				if (now <= last) {
-					/* no progress, perhaps just finished */
+					/*
+					 * no progress, perhaps just
+					 * finished
+					 */
 					DR_DELAY_IL(1, prog->data->stick_freq);
 					if (prog->critical->stat[i] ==
-						FMEM_LOOP_FMEM_READY)
+					    FMEM_LOOP_FMEM_READY)
 						break;
 					/* copy error */
 					if (prog->data->error[i] ==
-						EOPL_FMEM_COPY_ERROR) {
-						prog->data->fmem_status.error =
-							EOPL_FMEM_COPY_ERROR;
+					    EOPL_FMEM_COPY_ERROR) {
+						prog->data-> fmem_status.error =
+						    EOPL_FMEM_COPY_ERROR;
 						return (EOPL_FMEM_COPY_ERROR);
 					}
 					prog->data->fmem_status.error =
 					    EOPL_FMEM_COPY_TIMEOUT;
 					return (EOPL_FMEM_COPY_TIMEOUT);
 				}
-			    }
 			}
 		}
 
@@ -3312,8 +3322,8 @@
 		/*
 		 * drmach_fmem_loop_script()
 		 */
-		rtn = prog->critical->loop((void *)(prog->critical),
-			PAGESIZE, (void *)&(prog->critical->stat[cpuid]));
+		rtn = prog->critical->loop((void *)(prog->critical), PAGESIZE,
+		    (void *)&(prog->critical->stat[cpuid]));
 		prog->data->error[cpuid] = rtn;
 		/* slave thread does not care the rv */
 		return (0);
@@ -3363,8 +3373,7 @@
 
 	for (i = 0; i < DRMACH_FMEM_LOCKED_PAGES; i++) {
 		vtag_flushpage(new_va, (uint64_t)ksfmmup);
-		sfmmu_memtte(&tte, va_to_pfn(va),
-			PROC_DATA|HAT_NOSYNC, TTE8K);
+		sfmmu_memtte(&tte, va_to_pfn(va), PROC_DATA|HAT_NOSYNC, TTE8K);
 		tte.tte_intlo |= TTE_LCK_INT;
 		sfmmu_dtlb_ld_kva(new_va, &tte);
 		sfmmu_itlb_ld_kva(new_va, &tte);
@@ -3441,10 +3450,10 @@
 			continue;
 		if (bp->cores[onb_core_num].core_hotadded &
 		    (1 << strand_id)) {
-		    if (!(bp->cores[onb_core_num].core_started &
-			(1 << strand_id))) {
-			return (drerr_new(1, EOPL_CPU_STATE, NULL));
-		    }
+			if (!(bp->cores[onb_core_num].core_started &
+			    (1 << strand_id))) {
+				return (drerr_new(1, EOPL_CPU_STATE, NULL));
+			}
 		}
 	}
 
@@ -3501,7 +3510,7 @@
 	 */
 
 	prog_kmem = (drmach_copy_rename_program_t *)kmem_zalloc(
-		DRMACH_FMEM_LOCKED_PAGES * PAGESIZE, KM_SLEEP);
+	    DRMACH_FMEM_LOCKED_PAGES * PAGESIZE, KM_SLEEP);
 
 	prog_kmem->prog = prog_kmem;
 
@@ -3522,7 +3531,7 @@
 	 */
 
 	prog = prog_kmem->locked_prog = vmem_alloc(heap_arena,
-		DRMACH_FMEM_LOCKED_PAGES * PAGESIZE, VM_SLEEP);
+	    DRMACH_FMEM_LOCKED_PAGES * PAGESIZE, VM_SLEEP);
 	wp = bp = (caddr_t)prog;
 
 	/* Now remap prog_kmem to prog */
@@ -3530,24 +3539,23 @@
 
 	/* All pointers in prog are based on the alternate mapping */
 	prog->data = (drmach_copy_rename_data_t *)roundup(((uint64_t)prog +
-		sizeof (drmach_copy_rename_program_t)), sizeof (void *));
+	    sizeof (drmach_copy_rename_program_t)), sizeof (void *));
 
 	ASSERT(((uint64_t)prog->data + sizeof (drmach_copy_rename_data_t))
-		<= ((uint64_t)prog + PAGESIZE));
+	    <= ((uint64_t)prog + PAGESIZE));
 
 	prog->critical = (drmach_copy_rename_critical_t *)
-		(wp + DRMACH_FMEM_CRITICAL_PAGE * PAGESIZE);
-
-	prog->memlist_buffer = (caddr_t)(wp +
-		DRMACH_FMEM_MLIST_PAGE * PAGESIZE);
-
-	prog->stat = (drmach_cr_stat_t *)(wp +
-		DRMACH_FMEM_STAT_PAGE * PAGESIZE);
+	    (wp + DRMACH_FMEM_CRITICAL_PAGE * PAGESIZE);
+
+	prog->memlist_buffer = (caddr_t)(wp + DRMACH_FMEM_MLIST_PAGE *
+	    PAGESIZE);
+
+	prog->stat = (drmach_cr_stat_t *)(wp + DRMACH_FMEM_STAT_PAGE *
+	    PAGESIZE);
 
 	/* LINTED */
-	ASSERT(sizeof (drmach_cr_stat_t)
-		<= ((DRMACH_FMEM_LOCKED_PAGES - DRMACH_FMEM_STAT_PAGE)
-		* PAGESIZE));
+	ASSERT(sizeof (drmach_cr_stat_t) <= ((DRMACH_FMEM_LOCKED_PAGES -
+	    DRMACH_FMEM_STAT_PAGE) * PAGESIZE));
 
 	prog->critical->scf_reg_base = (uint64_t)-1;
 	prog->critical->scf_td[0] = (s_bd & 0xff);
@@ -3562,7 +3570,7 @@
 	wp = (caddr_t)roundup((uint64_t)bp + len, sizeof (void *));
 
 	len = (uint_t)((ulong_t)drmach_copy_rename_end -
-		(ulong_t)drmach_copy_rename_prog__relocatable);
+	    (ulong_t)drmach_copy_rename_prog__relocatable);
 
 	/*
 	 * We always leave 1K nop's to prevent the processor from
@@ -3571,12 +3579,12 @@
 	wp = wp + len + 1024;
 
 	len = (uint_t)((ulong_t)drmach_fmem_exec_script_end -
-		(ulong_t)drmach_fmem_exec_script);
+	    (ulong_t)drmach_fmem_exec_script);
 	/* this is the entry point of the loop script */
 	wp = wp + len + 1024;
 
 	len = (uint_t)((ulong_t)drmach_fmem_exec_script -
-		(ulong_t)drmach_fmem_loop_script);
+	    (ulong_t)drmach_fmem_loop_script);
 	wp = wp + len + 1024;
 
 	/* now we make sure there is 1K extra */
@@ -3592,7 +3600,7 @@
 
 	prog->critical->run = (int (*)())(wp);
 	len = (uint_t)((ulong_t)drmach_copy_rename_end -
-		(ulong_t)drmach_copy_rename_prog__relocatable);
+	    (ulong_t)drmach_copy_rename_prog__relocatable);
 
 	bcopy((caddr_t)drmach_copy_rename_prog__relocatable, wp, len);
 
@@ -3600,19 +3608,19 @@
 
 	prog->critical->fmem = (int (*)())(wp);
 	len = (int)((ulong_t)drmach_fmem_exec_script_end -
-		(ulong_t)drmach_fmem_exec_script);
+	    (ulong_t)drmach_fmem_exec_script);
 	bcopy((caddr_t)drmach_fmem_exec_script, wp, len);
 
 	len = (int)((ulong_t)drmach_fmem_exec_script_end -
-		(ulong_t)drmach_fmem_exec_script);
+	    (ulong_t)drmach_fmem_exec_script);
 	wp = (caddr_t)roundup((uint64_t)wp + len, 1024);
 
 	prog->critical->loop = (int (*)())(wp);
 	len = (int)((ulong_t)drmach_fmem_exec_script -
-		(ulong_t)drmach_fmem_loop_script);
+	    (ulong_t)drmach_fmem_loop_script);
 	bcopy((caddr_t)drmach_fmem_loop_script, (void *)wp, len);
 	len = (int)((ulong_t)drmach_fmem_loop_script_rtn-
-		(ulong_t)drmach_fmem_loop_script);
+	    (ulong_t)drmach_fmem_loop_script);
 	prog->critical->loop_rtn = (void (*)()) (wp+len);
 
 	prog->data->fmem_status.error = ESBD_NOERROR;
@@ -3633,7 +3641,7 @@
 	prog->data->mc_resume = mc_resume;
 
 	prog->critical->inst_loop_ret  =
-		*(uint64_t *)(prog->critical->loop_rtn);
+	    *(uint64_t *)(prog->critical->loop_rtn);
 
 	/*
 	 * 0x30800000 is op code "ba,a	+0"
@@ -3668,7 +3676,7 @@
 	} else {
 		for (i = 0; i < NCPU; i++) {
 			if (CPU_IN_SET(cpu_ready_set, i) &&
-				CPU_ACTIVE(cpu[i])) {
+			    CPU_ACTIVE(cpu[i])) {
 				CPUSET_ADD(prog->data->cpu_copy_set, i);
 				active_cpus++;
 			}
@@ -3693,7 +3701,7 @@
 
 	prog->data->stick_freq = system_clock_freq;
 	prog->data->copy_delay = ((copy_sz / min_copy_size_per_sec) + 2) *
-		system_clock_freq;
+	    system_clock_freq;
 
 	x_ml = c_ml;
 	c_addr = x_ml->address;
@@ -3709,17 +3717,16 @@
 		while (sz) {
 			if (c_size > sz) {
 				prog->data->cpu_ml[i] =
-					drmach_memlist_add_span(prog,
-					prog->data->cpu_ml[i],
-					c_addr, sz);
+				    drmach_memlist_add_span(prog,
+				    prog->data->cpu_ml[i], c_addr, sz);
 				c_addr += sz;
 				c_size -= sz;
 				break;
 			} else {
 				sz -= c_size;
-				prog->data->cpu_ml[i] = drmach_memlist_add_span(
-					prog, prog->data->cpu_ml[i],
-						c_addr, c_size);
+				prog->data->cpu_ml[i] =
+				    drmach_memlist_add_span(prog,
+				    prog->data->cpu_ml[i], c_addr, c_size);
 				x_ml = x_ml->next;
 				if (x_ml != NULL) {
 					c_addr = x_ml->address;
@@ -3742,8 +3749,8 @@
 out:
 	if (prog != NULL) {
 		drmach_unlock_critical((caddr_t)prog);
-		vmem_free(heap_arena, prog,
-			DRMACH_FMEM_LOCKED_PAGES * PAGESIZE);
+		vmem_free(heap_arena, prog, DRMACH_FMEM_LOCKED_PAGES *
+		    PAGESIZE);
 	}
 	if (prog_kmem != NULL) {
 		kmem_free(prog_kmem, DRMACH_FMEM_LOCKED_PAGES * PAGESIZE);
@@ -3779,11 +3786,10 @@
 		memlist_delete(prog->data->c_ml);
 
 	if ((prog->data->fmem_status.op &
-		(OPL_FMEM_SCF_START| OPL_FMEM_MC_SUSPEND)) !=
-		(OPL_FMEM_SCF_START | OPL_FMEM_MC_SUSPEND)) {
-		cmn_err(CE_PANIC, "drmach_copy_rename_fini: "
-			"invalid op code %x\n",
-				prog->data->fmem_status.op);
+	    (OPL_FMEM_SCF_START | OPL_FMEM_MC_SUSPEND)) !=
+	    (OPL_FMEM_SCF_START | OPL_FMEM_MC_SUSPEND)) {
+		cmn_err(CE_PANIC, "drmach_copy_rename_fini: invalid op "
+		    "code %x\n", prog->data->fmem_status.op);
 	}
 
 	fmem_error = prog->data->fmem_status.error;
@@ -3794,8 +3800,8 @@
 	/* possible ops are SCF_START, MC_SUSPEND */
 	if (prog->critical->fmem_issued) {
 		if (fmem_error != ESBD_NOERROR) {
-		    cmn_err(CE_PANIC, "Irrecoverable FMEM error %d\n",
-			fmem_error);
+			cmn_err(CE_PANIC, "Irrecoverable FMEM error %d\n",
+			    fmem_error);
 		}
 		rv = (*prog->data->scf_fmem_end)();
 		if (rv) {
@@ -3806,14 +3812,16 @@
 		 * Do all the copy rename post processing.
 		 */
 		drmach_swap_pa((drmach_mem_t *)prog->data->s_mem,
-			(drmach_mem_t *)prog->data->t_mem);
+		    (drmach_mem_t *)prog->data->t_mem);
 	} else {
 		rv = (*prog->data->scf_fmem_cancel)();
 		if (rv) {
-		    cmn_err(CE_WARN, "scf_fmem_cancel() failed rv=0x%x", rv);
-		    if (!err)
-			err = drerr_new(1, EOPL_SCF_FMEM_CANCEL,
-			    "scf_fmem_cancel() failed. rv = 0x%x", rv);
+			cmn_err(CE_WARN, "scf_fmem_cancel() failed rv=0x%x",
+			    rv);
+			if (!err) {
+				err = drerr_new(1, EOPL_SCF_FMEM_CANCEL,
+				    "scf_fmem_cancel() failed. rv = 0x%x", rv);
+			}
 		}
 	}
 	/* soft resume mac patrol */
@@ -3822,7 +3830,7 @@
 	drmach_unlock_critical((caddr_t)prog->locked_prog);
 
 	vmem_free(heap_arena, prog->locked_prog,
-		DRMACH_FMEM_LOCKED_PAGES * PAGESIZE);
+	    DRMACH_FMEM_LOCKED_PAGES * PAGESIZE);
 	kmem_free(prog, DRMACH_FMEM_LOCKED_PAGES * PAGESIZE);
 	return (err);
 }
@@ -3832,7 +3840,7 @@
 drmach_copy_rename_slave(struct regs *rp, drmachid_t id)
 {
 	drmach_copy_rename_program_t	*prog =
-		(drmach_copy_rename_program_t *)id;
+	    (drmach_copy_rename_program_t *)id;
 	register int			cpuid;
 	extern void			drmach_flush();
 	extern void			membar_sync_il();
@@ -3942,7 +3950,7 @@
 	prog->critical->scf_reg_base = (*prog->data->scf_get_base_addr)();
 
 	if (prog->critical->scf_reg_base == (uint64_t)-1 ||
-		prog->critical->scf_reg_base == NULL) {
+	    prog->critical->scf_reg_base == NULL) {
 		prog->data->fmem_status.error = EOPL_FMEM_SCF_ERR;
 		drmach_unlock_critical((caddr_t)prog);
 		return;
@@ -3966,15 +3974,14 @@
 	for (cpuid = 0; cpuid < NCPU; cpuid++) {
 		if (CPU_IN_SET(cpuset, cpuid)) {
 			xc_one(cpuid, (xcfunc_t *)drmach_lock_critical,
-				(uint64_t)prog_kmem, (uint64_t)prog);
+			    (uint64_t)prog_kmem, (uint64_t)prog);
 		}
 	}
 
 	cpuid = CPU->cpu_id;
 
 	xt_some(cpuset, (xcfunc_t *)drmach_sys_trap,
-				(uint64_t)drmach_copy_rename_slave,
-				(uint64_t)prog);
+	    (uint64_t)drmach_copy_rename_slave, (uint64_t)prog);
 	xt_sync(cpuset);
 
 	if (on_trap(&otd, OT_DATA_EC)) {
@@ -3989,6 +3996,7 @@
 
 	drmach_flush(prog->critical, PAGESIZE);
 	rtn = prog->critical->run(prog, cpuid);
+
 	drmach_flush_icache();
 
 
@@ -3996,8 +4004,7 @@
 	no_trap();
 	if (rtn == EOPL_FMEM_HW_ERROR) {
 		kpreempt_enable();
-		prom_panic("URGENT_ERROR_TRAP is "
-			"detected during FMEM.\n");
+		prom_panic("URGENT_ERROR_TRAP is detected during FMEM.\n");
 	}
 
 	/*
@@ -4013,7 +4020,7 @@
 
 	for (;;) {
 		inst = patch_inst((uint64_t *)prog->critical->loop_rtn,
-			prog->critical->inst_loop_ret);
+		    prog->critical->inst_loop_ret);
 		if (prog->critical->inst_loop_ret == inst) {
 			break;
 		}
@@ -4044,17 +4051,18 @@
 			drv_usecwait(1000);
 			now = prog->stat->nbytes[cpuid];
 			if (now <= last) {
-			    drv_usecwait(1000);
-			    if (prog->critical->stat[cpuid] == FMEM_LOOP_EXIT)
-				break;
-			    cmn_err(CE_PANIC,
-				"CPU %d hang during Copy Rename", cpuid);
+				drv_usecwait(1000);
+				if (prog->critical->stat[cpuid] ==
+				    FMEM_LOOP_EXIT)
+					break;
+				cmn_err(CE_PANIC, "CPU %d hang during Copy "
+				    "Rename", cpuid);
 			}
 			last = now;
 		}
 		if (prog->data->error[cpuid] == EOPL_FMEM_HW_ERROR) {
-			prom_panic("URGENT_ERROR_TRAP is "
-				"detected during FMEM.\n");
+			prom_panic("URGENT_ERROR_TRAP is detected during "
+			    "FMEM.\n");
 		}
 	}
 
@@ -4067,7 +4075,7 @@
 	for (cpuid = 0; cpuid < NCPU; cpuid++) {
 		if (CPU_IN_SET(cpuset, cpuid)) {
 			xc_one(cpuid, (xcfunc_t *)drmach_unlock_critical,
-				(uint64_t)prog, 0);
+			    (uint64_t)prog, 0);
 		}
 	}
 
@@ -4090,9 +4098,9 @@
 
 	if (prog->data->copy_wait_time > 0) {
 		DRMACH_PR("Unexpected long wait time %ld seconds "
-			"during copy rename on CPU %d\n",
-			prog->data->copy_wait_time/prog->data->stick_freq,
-			prog->data->slowest_cpuid);
+		    "during copy rename on CPU %d\n",
+		    prog->data->copy_wait_time/prog->data->stick_freq,
+		    prog->data->slowest_cpuid);
 	}
 	drmach_unlock_critical((caddr_t)prog);
 }
--- a/usr/src/uts/sun4u/opl/olympus_c/Makefile	Wed Sep 12 19:25:16 2007 -0700
+++ b/usr/src/uts/sun4u/opl/olympus_c/Makefile	Wed Sep 12 22:37:07 2007 -0700
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -42,6 +42,8 @@
 OBJECTS		= $(OLYMPUS_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(OLYMPUS_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_OPL_CPU_DIR)/$(MODULE)
+SOFTLINKS	= FJSV,SPARC64-VII
+ROOTSOFTLINKS	= $(SOFTLINKS:%=$(ROOT_OPL_CPU_DIR)/%)
 
 CPU_DIR		= .
 HERE		= ../olympus_c
--- a/usr/src/uts/sun4u/opl/os/opl.c	Wed Sep 12 19:25:16 2007 -0700
+++ b/usr/src/uts/sun4u/opl/os/opl.c	Wed Sep 12 22:37:07 2007 -0700
@@ -146,7 +146,7 @@
 		halt("No valid OPL model is found!");
 
 	if ((opl_cur_model->model_cmds & EXT_DISPATCH_TABLE) &&
-				(ts_dispatch_extended == -1)) {
+	    (ts_dispatch_extended == -1)) {
 		/*
 		 * Based on a platform model, select a dispatch table.
 		 * Only DC2 and DC3 systems uses the alternate/extended
@@ -341,8 +341,8 @@
 	if (kernel_cage_enable) {
 		pgcnt_t preferred_cage_size;
 
-		preferred_cage_size =
-			MAX(opl_startup_cage_size, total_pages / 256);
+		preferred_cage_size = MAX(opl_startup_cage_size,
+		    total_pages / 256);
 
 		ml = opl_memlist_per_board(phys_avail);
 
@@ -495,7 +495,7 @@
 	}
 	if (prom_getprop(nodeid, "sb-mem-ranges", (caddr_t)&mem_range) < 0) {
 		panic("Can not find sb-mem-ranges property in mc node %x",
-			nodeid);
+		    nodeid);
 	}
 	memnode = mem_range.addr >> OPL_MC_MEMBOARD_SHIFT;
 	plat_assign_lgrphand_to_mem_node(board, memnode);
@@ -760,10 +760,10 @@
 		 */
 		if (scf_panic_callback == NULL)
 			scf_panic_callback = (void (*)(int))
-				modgetsymvalue("scf_panic_callb", 0);
+			    modgetsymvalue("scf_panic_callb", 0);
 		if (scf_shutdown_callback == NULL)
 			scf_shutdown_callback = (void (*)(int))
-				modgetsymvalue("scf_shutdown_callb", 0);
+			    modgetsymvalue("scf_shutdown_callb", 0);
 
 		switch (sub_state) {
 		case SIGSUBST_PANIC:
@@ -816,8 +816,8 @@
 	 */
 	if (flt_in_memory) {
 		if (opl_get_mem_unum != NULL) {
-			return (opl_get_mem_unum(synd_code, flt_addr,
-				buf, buflen, lenp));
+			return (opl_get_mem_unum(synd_code, flt_addr, buf,
+			    buflen, lenp));
 		} else {
 			return (ENOTSUP);
 		}
@@ -894,9 +894,8 @@
 	 * find the symbol for the SCF put routine in driver
 	 */
 	if (scf_service_function == NULL)
-		scf_service_function =
-			(int (*)(uint32_t, uint8_t, uint32_t, uint32_t, void *))
-			modgetsymvalue("scf_service_putinfo", 0);
+		scf_service_function = (int (*)(uint32_t, uint8_t, uint32_t,
+		    uint32_t, void *)) modgetsymvalue("scf_service_putinfo", 0);
 
 	/*
 	 * If the symbol was found, call it.  Otherwise, log a note (but not to
@@ -924,9 +923,8 @@
 		delay(10 * drv_usectohz(1000000));
 	}
 	if (counter == 0)
-		cmn_err(CE_NOTE,
-			"!plat_nodename_set: "
-			"scf_service_putinfo not responding\n");
+		cmn_err(CE_NOTE, "!plat_nodename_set: scf_service_putinfo not "
+		    "responding\n");
 
 	kmem_free(datap, sizeof (struct utsname));
 }
@@ -978,7 +976,7 @@
 	int	impl;
 
 	impl = cpunodes[cpuid].implementation;
-	if (IS_OLYMPUS_C(impl)) {
+	if (IS_OLYMPUS_C(impl) || IS_JUPITER(impl)) {
 		info->mmu_idx = MMU_ID(cpuid);
 		info->mmu_nctxs = 8192;
 	} else {
@@ -1038,9 +1036,8 @@
 		 * If desired backoff is long enough,
 		 * use sleep for most of it
 		 */
-		for (cnt = *backoff;
-			cnt >= OPL_BOFF_SLEEP;
-			cnt -= OPL_BOFF_SLEEP) {
+		for (cnt = *backoff; cnt >= OPL_BOFF_SLEEP;
+		    cnt -= OPL_BOFF_SLEEP) {
 			cpu_smt_pause();
 		}
 		/*
--- a/usr/src/uts/sun4u/opl_pcbe/Makefile	Wed Sep 12 19:25:16 2007 -0700
+++ b/usr/src/uts/sun4u/opl_pcbe/Makefile	Wed Sep 12 22:37:07 2007 -0700
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
@@ -38,6 +38,7 @@
 OBJECTS		= $(OPL_PCBE_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(OPL_PCBE_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(USR_PCBE_DIR)/$(MODULE)
+ROOTLINK        = $(USR_PCBE_DIR)/pcbe.4.7
 
 #
 #	Include common rules.
@@ -50,7 +51,7 @@
 ALL_TARGET	= $(BINARY)
 LINT_MODULE	= opl_pcbe
 LINT_TARGET	= $(LINT_MODULE).lint
-INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
+INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOTLINK)
 
 #
 # lint pass one enforcement
@@ -86,6 +87,9 @@
 
 install:	$(INSTALL_DEPS)
 
+$(ROOTLINK):	$(ROOTMODULE)
+	-$(RM) $@; ln $(ROOTMODULE) $@
+
 #
 #	Include common targets.
 #
--- a/usr/src/uts/sun4u/os/cmp.c	Wed Sep 12 19:25:16 2007 -0700
+++ b/usr/src/uts/sun4u/os/cmp.c	Wed Sep 12 22:37:07 2007 -0700
@@ -151,15 +151,16 @@
 
 	switch (hw) {
 	case PGHW_IPIPE:
-		if (IS_OLYMPUS_C(impl))
+		if ((IS_OLYMPUS_C(impl)) || (IS_JUPITER(impl)))
 			return (1);
 		break;
 	case PGHW_CHIP:
-		if (IS_JAGUAR(impl) || IS_PANTHER(impl) || IS_OLYMPUS_C(impl))
+		if (IS_JAGUAR(impl) || IS_PANTHER(impl) ||
+		    IS_OLYMPUS_C(impl) || IS_JUPITER(impl))
 			return (1);
 		break;
 	case PGHW_CACHE:
-		if (IS_PANTHER(impl) || IS_OLYMPUS_C(impl))
+		if (IS_PANTHER(impl) || IS_OLYMPUS_C(impl) || IS_JUPITER(impl))
 			return (1);
 		break;
 	}
@@ -179,8 +180,9 @@
 		return (pg_plat_hw_instance_id(cpu_a, hw) ==
 		    pg_plat_hw_instance_id(cpu_b, hw));
 	case PGHW_CACHE:
-		if ((IS_PANTHER(impl) || IS_OLYMPUS_C(impl)) &&
-		    pg_plat_cpus_share(cpu_a, cpu_b, PGHW_CHIP)) {
+		if ((IS_PANTHER(impl) || IS_OLYMPUS_C(impl) ||
+		    IS_JUPITER(impl)) && pg_plat_cpus_share(cpu_a,
+		    cpu_b, PGHW_CHIP)) {
 			return (1);
 		} else {
 			return (0);
@@ -198,11 +200,12 @@
 
 	switch (hw) {
 	case PGHW_IPIPE:
-		if (IS_OLYMPUS_C(impl)) {
+		if (IS_OLYMPUS_C(impl) || IS_JUPITER(impl)) {
 			/*
-			 * Currently only Fujitsu Olympus-c processor supports
-			 * multi-stranded cores. Return the cpu_id with
-			 * the strand bit masked out.
+			 * Currently only Fujitsu Olympus-C (SPARC64-VI) and
+			 * Jupiter (SPARC64-VII) processors support
+			 * multi-stranded cores. Return the cpu_id with the
+			 * strand bit masked out.
 			 */
 			return ((id_t)((uint_t)cpu->cpu_id & ~(0x1)));
 		} else {
@@ -211,7 +214,8 @@
 	case PGHW_CHIP:
 		return (cmp_cpu_to_chip(cpu->cpu_id));
 	case PGHW_CACHE:
-		if (IS_PANTHER(impl) || IS_OLYMPUS_C(impl))
+		if (IS_PANTHER(impl) ||
+		    IS_OLYMPUS_C(impl) || IS_JUPITER(impl))
 			return (pg_plat_hw_instance_id(cpu, PGHW_CHIP));
 		else
 			return (cpu->cpu_id);
--- a/usr/src/uts/sun4u/os/fillsysinfo.c	Wed Sep 12 19:25:16 2007 -0700
+++ b/usr/src/uts/sun4u/os/fillsysinfo.c	Wed Sep 12 22:37:07 2007 -0700
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -462,8 +462,8 @@
 	}
 
 	if (cpuid < 0 || cpuid >= NCPU) {
-		cmn_err(CE_PANIC, "cpu node %x: cpuid %d out of range",
-			node, cpuid);
+		cmn_err(CE_PANIC, "cpu node %x: cpuid %d out of range", node,
+		    cpuid);
 		return;
 	}
 
@@ -677,7 +677,7 @@
 
 	if (cpuid < 0 || cpuid >= NCPU) {
 		cmn_err(CE_PANIC, "cpu dip %p: cpuid %d out of range",
-			(void *) dip, cpuid);
+		    (void *)dip, cpuid);
 		return;
 	}
 
@@ -794,10 +794,10 @@
 	cpunode->msram = ECACHE_CPU_NON_MIRROR;
 
 	if (ddi_prop_exists(DDI_DEV_T_ANY, dip, DDI_PROP_DONTPASS, "msram")) {
-			cpunode->msram = ECACHE_CPU_MIRROR;
+		cpunode->msram = ECACHE_CPU_MIRROR;
 	} else if (ddi_prop_exists(DDI_DEV_T_ANY, dip, DDI_PROP_DONTPASS,
-			"msram-observed")) {
-				cpunode->msram = ECACHE_CPU_MIRROR;
+	    "msram-observed")) {
+		cpunode->msram = ECACHE_CPU_MIRROR;
 	}
 
 	ASSERT(ncpunode > 0);	/* fiximp not req'd */
@@ -862,11 +862,12 @@
 
 		if (IS_SPITFIRE(impl)) {
 			if (cpunodes[i].version < min_supported_rev) {
-				cmn_err(CE_PANIC,
-				"UltraSPARC versions older than %d.%d"
-				" are no longer supported (cpu #%d)",
-				SPITFIRE_MAJOR_VERSION(min_supported_rev),
-				SPITFIRE_MINOR_VERSION(min_supported_rev), i);
+				cmn_err(CE_PANIC, "UltraSPARC versions older "
+				    "than %d.%d are no longer supported "
+				    "(cpu #%d)",
+				    SPITFIRE_MAJOR_VERSION(min_supported_rev),
+				    SPITFIRE_MINOR_VERSION(min_supported_rev),
+				    i);
 			}
 
 			/*
@@ -891,11 +892,12 @@
 
 		if (IS_CHEETAH(impl)) {
 			if (cpunodes[i].version < min_supported_rev) {
-				cmn_err(CE_PANIC,
-				"UltraSPARC-III versions older than %d.%d"
-				" are no longer supported (cpu #%d)",
-				CHEETAH_MAJOR_VERSION(min_supported_rev),
-				CHEETAH_MINOR_VERSION(min_supported_rev), i);
+				cmn_err(CE_PANIC, "UltraSPARC-III versions "
+				    "older than %d.%d are no longer supported "
+				    "(cpu #%d)",
+				    CHEETAH_MAJOR_VERSION(min_supported_rev),
+				    CHEETAH_MINOR_VERSION(min_supported_rev),
+				    i);
 			}
 
 		}
@@ -918,6 +920,7 @@
 	int i;
 	int impl;
 	int npanther = 0;
+	int njupiter = 0;
 
 	impl = cpunodes[getprocessorid()].implementation;
 
@@ -944,6 +947,26 @@
 			}
 		}
 		break;
+	case OLYMPUS_C_IMPL:
+	case JUPITER_IMPL:
+		/*
+		 * Check for a legal heterogeneous set of CPUs on the
+		 * OPL platform.
+		 */
+		for (i = 0; i < NCPU; i++) {
+			if (cpunodes[i].nodeid == 0)
+				continue;
+
+			if (IS_JUPITER(cpunodes[i].implementation)) {
+				njupiter += 1;
+			}
+			if (!(IS_OLYMPUS_C(cpunodes[i].implementation) ||
+			    IS_JUPITER(cpunodes[i].implementation))) {
+				use_mp = 0;
+				break;
+			}
+		}
+		break;
 	default:
 		/*
 		 * Check for a homogeneous set of CPUs.
@@ -973,13 +996,21 @@
 	}
 
 	/*
+	 * For all-Jupiter domains the cpu module will update the hwcap features
+	 * for integer multiply-add instruction support.
+	 */
+	if ((njupiter == ncpunode) && (&cpu_fix_alljupiter)) {
+		cpu_fix_alljupiter();
+	}
+
+	/*
 	 * Set max cpus we can have based on ncpunode and use_mp
 	 */
 	if (use_mp) {
 		int (*set_max_ncpus)(void);
 
 		set_max_ncpus = (int (*)(void))
-			kobj_getsymvalue("set_platform_max_ncpus", 0);
+		    kobj_getsymvalue("set_platform_max_ncpus", 0);
 
 		if (set_max_ncpus) {
 			max_ncpus = set_max_ncpus();
@@ -1148,9 +1179,9 @@
 		if (GETPROP(node, "model", buf) != -1) {
 			if ((strcmp(buf, "m5819p") == 0) ||
 			    (strcmp(buf, "m5823") == 0))
-			    tod_module_name = "todm5823";
+				tod_module_name = "todm5823";
 			else if (strcmp(buf, "ds1287") == 0)
-			    tod_module_name = "todds1287";
+				tod_module_name = "todds1287";
 		}
 	}
 
--- a/usr/src/uts/sun4u/pcbe/opl_pcbe.c	Wed Sep 12 19:25:16 2007 -0700
+++ b/usr/src/uts/sun4u/pcbe/opl_pcbe.c	Wed Sep 12 22:37:07 2007 -0700
@@ -24,7 +24,7 @@
  */
 
 /*
- * SPARC64 VI Performance Counter Backend
+ * SPARC64 VI & VII Performance Counter Backend
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
@@ -110,7 +110,7 @@
  *
  *
  * Performance Instrumentation Counter (PIC)
- * Four PICs are implemented in SPARC64 VI,
+ * Four PICs are implemented in SPARC64 VI and VII,
  * each PIC is accessed using PCR.SC as a select field.
  *
  * +------------------------+--------------------------+
@@ -199,15 +199,20 @@
 
 static const struct nametable SPARC64_VI_names_l0[] = {
 	SPARC64_VI_EVENTS_comm_0,
+	{0x2,	"only_this_thread_active"},
+	{0x3,	"w_cse_window_empty"},
+	{0x4,	"w_op_stv_wait_nc_pend"},
 	SPARC64_VI_EVENTS_comm_1,
 	{0x12,	"flush_rs"},
 	{0x13,	"2iid_use"},
 	{0x15,	"toq_rsbr_phantom"},
 	{0x16,	"trap_int_vector"},
 	{0x18,	"ts_by_sxmiss"},
+	{0x18,	"both_threads_active"},
 	SPARC64_VI_EVENTS_comm_2,
 	{0x1d,	"op_stv_wait_sxmiss"},
 	{0x1e,	"eu_comp_wait"},
+	{0x23,	"op_l1_thrashing"},
 	{0x24,	"swpf_fail_all"},
 	{0x30,	"sx_miss_wait_pf"},
 	{0x31,	"jbus_cpi_count"},
@@ -224,10 +229,12 @@
 	{0x13,	"1iid_use"},
 	{0x16,	"trap_all"},
 	{0x18,	"thread_switch_all"},
+	{0x18,	"only_this_thread_active"},
 	SPARC64_VI_EVENTS_comm_2,
 	{0x1d,	"act_thread_suspend"},
 	{0x1e,	"cse_window_empty"},
 	{0x1f,	"inh_cmit_gpr_2write"},
+	{0x23,	"if_l1_thrashing"},
 	{0x24,	"swpf_success_all"},
 	{0x30,	"sx_miss_wait_dm"},
 	{0x31,	"jbus_bi_count"},
@@ -238,6 +245,9 @@
 
 static const struct nametable SPARC64_VI_names_l1[] = {
 	SPARC64_VI_EVENTS_comm_0,
+	{0x2,	"single_mode_instructions"},
+	{0x3,	"w_branch_comp_wait"},
+	{0x4,	"w_op_stv_wait_sxmiss_ex"},
 	SPARC64_VI_EVENTS_comm_1,
 	{0x13,	"4iid_use"},
 	{0x15,	"flush_rs"},
@@ -257,10 +267,14 @@
 
 static const struct nametable SPARC64_VI_names_u1[] = {
 	SPARC64_VI_EVENTS_comm_0,
+	{0x2,	"single_mode_cycle_counts"},
+	{0x3,	"w_eu_comp_wait"},
+	{0x4,	"w_op_stv_wait_sxmiss"},
 	SPARC64_VI_EVENTS_comm_1,
 	{0x13,	"3iid_use"},
 	{0x16,	"trap_int_level"},
 	{0x18,	"ts_by_data_arrive"},
+	{0x18,	"both_threads_empty"},
 	SPARC64_VI_EVENTS_comm_2,
 	{0x1b,	"op_stv_wait_nc_pend"},
 	{0x1d,	"op_stv_wait_sxmiss_ex"},
@@ -276,6 +290,9 @@
 
 static const struct nametable SPARC64_VI_names_l2[] = {
 	SPARC64_VI_EVENTS_comm_0,
+	{0x2,	"d_move_wait"},
+	{0x3,	"w_op_stv_wait"},
+	{0x4,	"w_fl_comp_wait"},
 	SPARC64_VI_EVENTS_comm_1,
 	{0x13,	"sync_intlk"},
 	{0x16,	"trap_trap_inst"},
@@ -313,6 +330,9 @@
 
 static const struct nametable SPARC64_VI_names_l3[] = {
 	SPARC64_VI_EVENTS_comm_0,
+	{0x2,	"xma_inst"},
+	{0x3,	"w_0endop"},
+	{0x4,	"w_op_stv_wait_ex"},
 	SPARC64_VI_EVENTS_comm_1,
 	{0x16,	"trap_DMMU_miss"},
 	{0x18,	"ts_by_suspend"},
@@ -330,11 +350,15 @@
 
 static const struct nametable SPARC64_VI_names_u3[] = {
 	SPARC64_VI_EVENTS_comm_0,
+	{0x2,	"cse_priority_wait"},
+	{0x3,	"w_d_move"},
+	{0x4,	"w_cse_window_empty_sp_full"},
 	SPARC64_VI_EVENTS_comm_1,
 	{0x13,	"regwin_intlk"},
 	{0x15,	"rs1"},
 	{0x16,	"trap_IMMU_miss"},
 	SPARC64_VI_EVENTS_comm_2,
+	{0x1d,	"both_threads_suspended"},
 	{0x1e,	"1endop"},
 	{0x1f,	"op_stv_wait_sxmiss_ex"},
 	{0x20,	"if_wait_all"},
@@ -375,8 +399,8 @@
 static const char *opl_cpuref;
 static char *pic_events[CPC_SPARC64_VI_NPIC];
 
-static const char *sp_6_ref = "See the \"SPARC64 VI extensions\" "
-			"for descriptions of these events.";
+static const char *sp_6_ref = "See the \"SPARC64 VI extensions\" and "
+	"\"SPARC64 VII extensions\" for descriptions of these events.";
 
 static int
 opl_pcbe_init(void)
@@ -392,8 +416,9 @@
 	 */
 	switch (ULTRA_VER_IMPL(ultra_getver())) {
 	case OLYMPUS_C_IMPL:
+	case JUPITER_IMPL:
 		events = SPARC64_VI_names;
-		opl_impl_name = "SPARC64 VI";
+		opl_impl_name = "SPARC64 VI & VII";
 		opl_cpuref = sp_6_ref;
 		break;
 	default:
@@ -733,7 +758,7 @@
 
 static struct modlpcbe modlpcbe = {
 	&mod_pcbeops,
-	"SPARC64 VI Performance Counters v%I%",
+	"SPARC64 VI&VII Perf Cntrs v%I%",
 	&opl_pcbe_ops
 };
 
--- a/usr/src/uts/sun4u/sys/cpu_impl.h	Wed Sep 12 19:25:16 2007 -0700
+++ b/usr/src/uts/sun4u/sys/cpu_impl.h	Wed Sep 12 22:37:07 2007 -0700
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -100,8 +100,16 @@
 #define	OLYMPUS_REV_MASK(x)		(((x) >> 28) & 0x7)
 #define	OLYMPUS_C_A			0
 
+/*
+ * Definitions for Jupiter cpu.
+ */
+#define	JUPITER_IMPL			0x7
+#define	IS_JUPITER(impl)		((impl) == JUPITER_IMPL)
+
 #define	CPU_IMPL_IS_CMP(impl)		(IS_JAGUAR(impl) || \
-					IS_PANTHER(impl) || IS_OLYMPUS_C(impl))
+					IS_PANTHER(impl) || \
+					IS_OLYMPUS_C(impl) || \
+					IS_JUPITER(impl))
 
 #ifdef	__cplusplus
 }
--- a/usr/src/uts/sun4u/sys/cpu_module.h	Wed Sep 12 19:25:16 2007 -0700
+++ b/usr/src/uts/sun4u/sys/cpu_module.h	Wed Sep 12 22:37:07 2007 -0700
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -68,6 +68,8 @@
 void	cpu_fiximp(pnode_t dnode);
 #pragma weak cpu_fix_allpanther
 void	cpu_fix_allpanther(void);
+#pragma weak cpu_fix_alljupiter
+void	cpu_fix_alljupiter(void);
 #pragma weak mmu_init_mmu_page_sizes
 int	mmu_init_mmu_page_sizes(int cinfo);
 
--- a/usr/src/uts/sun4u/sys/machasi.h	Wed Sep 12 19:25:16 2007 -0700
+++ b/usr/src/uts/sun4u/sys/machasi.h	Wed Sep 12 22:37:07 2007 -0700
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -105,6 +105,8 @@
 #define	ASI_DTLB_ACCESS		0x5D	/* dmmu tlb data access */
 #define	ASI_DTLB_TAGREAD	0x5E	/* dmmu tlb tag read */
 #define	ASI_DTLB_DEMAP		0x5F	/* dmmu tlb demap */
+#define	ASI_ITSB_PREFETCH	0x61	/* IMMU tsb prefetch */
+#define	ASI_DTSB_PREFETCH	0x62	/* DMMU tsb prefetch */
 
 #define	ASI_IC_DATA		0x66	/* i$ data */
 #define	ASI_IC_TAG		0x67	/* i$ tag */
--- a/usr/src/uts/sun4u/sys/mmu.h	Wed Sep 12 19:25:16 2007 -0700
+++ b/usr/src/uts/sun4u/sys/mmu.h	Wed Sep 12 22:37:07 2007 -0700
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -63,6 +62,7 @@
 #define	MMU_TSB_SX		0x50 /* d tsb secondary extension reg */
 #define	MMU_TSB_NX		0x58 /* i/d tsb nucleus extension reg */
 #define	MMU_TAG_ACCESS_EXT	0x60 /* tlb tag access extension reg */
+#define	MMU_SHARED_CONTEXT	0x68 /* SPARC64-VII shared context */
 
 
 
@@ -198,6 +198,19 @@
 #define	TAGACCEXT_MKSZPAIR(SZ1, SZ0)	(((SZ1) << 3) | (SZ0))
 
 /*
+ * SPARC64-VII tsb prefetch register layout and VAs
+ *
+ * +-------------------------+-+---------+-+--+------+
+ * | virtual address [63:13] | | page_sz |V|  |TSB_sz|
+ * +-------------------------+-+---------+-+--+------+
+ *  63			  13	11	9 8    5    0
+ */
+#define	VA_UTSBPREF_8K		0x00
+#define	VA_UTSBPREF_4M		0x08
+#define	VA_KTSBPREF_8K		0x40
+#define	VA_KTSBPREF_4M		0x48
+
+/*
  * MMU PRIMARY/SECONDARY CONTEXT register
  */
 #define	CTXREG_CTX_MASK		0x1FFF
--- a/usr/src/uts/sun4u/sys/opl.h	Wed Sep 12 19:25:16 2007 -0700
+++ b/usr/src/uts/sun4u/sys/opl.h	Wed Sep 12 22:37:07 2007 -0700
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -32,7 +32,7 @@
 extern "C" {
 #endif
 
-#define	OPL_MAX_CPU_PER_CMP		4
+#define	OPL_MAX_CPU_PER_CMP		8
 #define	OPL_MAX_CORES_PER_CMP		4
 #define	OPL_MAX_STRANDS_PER_CORE	2
 #define	OPL_MAX_CMP_UNITS_PER_BOARD	4
--- a/usr/src/uts/sun4u/sys/opl_cfg.h	Wed Sep 12 19:25:16 2007 -0700
+++ b/usr/src/uts/sun4u/sys/opl_cfg.h	Wed Sep 12 22:37:07 2007 -0700
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -198,6 +198,7 @@
 	dev_info_t		*pr_parent;
 	dev_info_t		*pr_node;
 	int			pr_hold;
+	unsigned		pr_cpu_impl;
 } opl_probe_t;
 
 #define	OPL_STR_LEN	256
@@ -288,7 +289,7 @@
 /*
  * Functions used by drmach
  */
-extern int	opl_probe_sb(int);
+extern int	opl_probe_sb(int, unsigned *);
 extern int	opl_unprobe_sb(int);
 extern int	opl_read_hwd(int, hwd_header_t **, hwd_sb_status_t **,
 				hwd_domain_info_t **, hwd_sb_t **);
--- a/usr/src/uts/sun4u/sys/sbd_ioctl.h	Wed Sep 12 19:25:16 2007 -0700
+++ b/usr/src/uts/sun4u/sys/sbd_ioctl.h	Wed Sep 12 22:37:07 2007 -0700
@@ -582,7 +582,7 @@
 #define	ESGT_NOT_SUPP		4027	/* Operation not supported */
 #define	ESGT_NO_MEM		4028	/* No Memory */
 
-/* opl error codes */
+/* OPL error codes */
 
 #define	EOPL_GETPROP		5001	/* Cannot read property value */
 #define	EOPL_BNUM		5002	/* Invalid board number */
@@ -615,6 +615,8 @@
 #define	EOPL_FMEM_TERMINATE	5027	/* FMEM operation Terminated */
 #define	EOPL_FMEM_COPY_ERROR	5028	/* Memory copy error */
 #define	EOPL_FMEM_SCF_ERR	5029	/* SCF error */
+#define	EOPL_MIXED_CPU		5030
+	/* Cannot add SPARC64-VI to domain booted with all SPARC64-VII CPUs */
 
 #ifdef	__cplusplus
 }