Mercurial > illumos > illumos-gate
changeset 78:0e13b95244dd
6289703 Remove SUNWust1u.v package -- we do not need it
6290564 Move sun4v PCBE to architecture specific /platform directory
6288882 fix the lint warnings caused by bugid 6263600
| author | ae112802 |
|---|---|
| date | Mon, 27 Jun 2005 10:46:13 -0700 |
| parents | 7d6fd6f79ca7 |
| children | f9505af65697 |
| files | deleted_files/usr/src/pkgdefs/SUNWust1u.v/Makefile deleted_files/usr/src/pkgdefs/SUNWust1u.v/pkginfo.tmpl deleted_files/usr/src/pkgdefs/SUNWust1u.v/prototype_com deleted_files/usr/src/pkgdefs/SUNWust1u.v/prototype_sparc usr/src/Makefile.psm usr/src/Makefile.psm.targ usr/src/pkgdefs/Makefile usr/src/pkgdefs/SUNWust1.v/prototype_com usr/src/pkgdefs/SUNWust1u.v/Makefile usr/src/pkgdefs/SUNWust1u.v/pkginfo.tmpl usr/src/pkgdefs/SUNWust1u.v/prototype_com usr/src/pkgdefs/SUNWust1u.v/prototype_sparc usr/src/tools/scripts/bfu.sh usr/src/uts/common/os/clock.c usr/src/uts/common/sys/systm.h usr/src/uts/sun4/os/platmod.c usr/src/uts/sun4v/niagara_pcbe/Makefile |
| diffstat | 17 files changed, 221 insertions(+), 207 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/deleted_files/usr/src/pkgdefs/SUNWust1u.v/Makefile Mon Jun 27 10:46:13 2005 -0700 @@ -0,0 +1,38 @@ +# +# 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. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +#pragma ident "%Z%%M% %I% %E% SMI" +# + +include ../Makefile.com + +DATAFILES += i.preserve depend + +.KEEP_STATE: + +all: $(FILES) +install: all pkg + +include ../Makefile.targ
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/deleted_files/usr/src/pkgdefs/SUNWust1u.v/pkginfo.tmpl Mon Jun 27 10:46:13 2005 -0700 @@ -0,0 +1,55 @@ +# +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +# 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. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# ident "%Z%%M% %I% %E% SMI" +# +# This required package information file describes characteristics of the +# package, such as package abbreviation, full package name, package version, +# and package architecture. +# +PKG="SUNWust1u" +NAME="UltraSPARC-T1 (User)" +ARCH="sparc.sun4v" +VERSION="ONVERS,REV=0.0.0" +SUNW_PRODNAME="SunOS" +SUNW_PRODVERS="RELEASE/VERSION" +SUNW_PKGTYPE="kvm" +MAXINST="1000" +CATEGORY="system" +DESC="UltraSPARC-T1 CPU utilities" +VENDOR="Sun Microsystems, Inc." +HOTLINE="Please contact your local service provider" +EMAIL="" +CLASSES="none preserve" +BASEDIR=/ +SUNW_PKGVERS="1.0" +SUNW_PKG_ALLZONES="true" +SUNW_PKG_HOLLOW="false" +#VSTOCK="<reserved by Release Engineering for package part #>" +#ISTATES="<developer defined>" +#RSTATES='<developer defined>' +#ULIMIT="<developer defined>" +#ORDER="<developer defined>" +#PSTAMP="<developer defined>" +#INTONLY="<developer defined>"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/deleted_files/usr/src/pkgdefs/SUNWust1u.v/prototype_com Mon Jun 27 10:46:13 2005 -0700 @@ -0,0 +1,52 @@ +# +# 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. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +#pragma ident "%Z%%M% %I% %E% SMI" +# +# This required package information file contains a list of package contents. +# The 'pkgmk' command uses this file to identify the contents of a package +# and their location on the development machine when building the package. +# Can be created via a text editor or through use of the 'pkgproto' command. + +#!search <pathname pathname ...> # where to find pkg objects +#!include <filename> # include another 'prototype' file +#!default <mode> <owner> <group> # default used if not specified on entry +#!<param>=<value> # puts parameter in pkg environment + +# packaging files +i pkginfo +i copyright +i i.preserve +i depend +# +# source locations relative to the prototype file +# +# SUNWust1u.v +# +d none usr 755 root sys +d none usr/kernel 755 root sys +d none usr/kernel/pcbe 755 root sys +d none usr/kernel/pcbe/sparcv9 755 root sys +f none usr/kernel/pcbe/sparcv9/pcbe.SUNW,UltraSPARC-T1 755 root sys
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/deleted_files/usr/src/pkgdefs/SUNWust1u.v/prototype_sparc Mon Jun 27 10:46:13 2005 -0700 @@ -0,0 +1,50 @@ +# +# 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. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +# ident "%Z%%M% %I% %E% SMI" +# +# This required package information file contains a list of package contents. +# The 'pkgmk' command uses this file to identify the contents of a package +# and their location on the development machine when building the package. +# Can be created via a text editor or through use of the 'pkgproto' command. + +#!search <pathname pathname ...> # where to find pkg objects +#!include <filename> # include another 'prototype' file +#!default <mode> <owner> <group> # default used if not specified on entry +#!<param>=<value> # puts parameter in pkg environment + +# +# Include ISA independent files (prototype_com) +# +!include prototype_com +# +# +# +# List files which are SPARC specific here +# +# source locations relative to the prototype file +# +# SUNWust1u.v +#
--- a/usr/src/Makefile.psm Sat Jun 25 17:21:41 2005 -0700 +++ b/usr/src/Makefile.psm Mon Jun 27 10:46:13 2005 -0700 @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 1999-2003 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -66,6 +66,7 @@ ROOT_PSM_MMU_DIR_32 = $(ROOT_PSM_MOD_DIR)/mmu ROOT_PSM_DACF_DIR_32 = $(ROOT_PSM_MOD_DIR)/dacf ROOT_PSM_CRYPTO_DIR_32 = $(ROOT_PSM_MOD_DIR)/crypto +ROOT_PSM_PCBE_DIR_32 = $(ROOT_PSM_MOD_DIR)/pcbe ROOT_PSM_KERN_DIR_64 = $(ROOT_PSM_MOD_DIR)/$(SUBDIR64) ROOT_PSM_DRV_DIR_64 = $(ROOT_PSM_MOD_DIR)/drv/$(SUBDIR64) @@ -83,6 +84,7 @@ ROOT_PSM_MMU_DIR_64 = $(ROOT_PSM_MOD_DIR)/mmu/$(SUBDIR64) ROOT_PSM_DACF_DIR_64 = $(ROOT_PSM_MOD_DIR)/dacf/$(SUBDIR64) ROOT_PSM_CRYPTO_DIR_64 = $(ROOT_PSM_MOD_DIR)/crypto/$(SUBDIR64) +ROOT_PSM_PCBE_DIR_64 = $(ROOT_PSM_MOD_DIR)/pcbe/$(SUBDIR64) ROOT_PSM_KERN_DIR = $(ROOT_PSM_KERN_DIR_$(CLASS)) ROOT_PSM_DRV_DIR = $(ROOT_PSM_DRV_DIR_$(CLASS)) @@ -100,6 +102,7 @@ ROOT_PSM_MMU_DIR = $(ROOT_PSM_MMU_DIR_$(CLASS)) ROOT_PSM_DACF_DIR = $(ROOT_PSM_DACF_DIR_$(CLASS)) ROOT_PSM_CRYPTO_DIR = $(ROOT_PSM_CRYPTO_DIR_$(CLASS)) +ROOT_PSM_PCBE_DIR = $(ROOT_PSM_PCBE_DIR_$(CLASS)) ROOT_PSM_MOD_DIRS_32 = $(ROOT_PSM_DRV_DIR_32) ROOT_PSM_MOD_DIRS_32 += $(ROOT_PSM_EXEC_DIR_32) $(ROOT_PSM_FS_DIR_32) @@ -111,6 +114,7 @@ ROOT_PSM_MOD_DIRS_32 += $(ROOT_PSM_MMU_DIR_32) ROOT_PSM_MOD_DIRS_32 += $(ROOT_PSM_DACF_DIR_32) ROOT_PSM_MOD_DIRS_32 += $(ROOT_PSM_CRYPTO_DIR_32) +ROOT_PSM_MOD_DIRS_32 += $(ROOT_PSM_PCBE_DIR_32) USR_PLAT_DIR = $(ROOT)/usr/platform
--- a/usr/src/Makefile.psm.targ Sat Jun 25 17:21:41 2005 -0700 +++ b/usr/src/Makefile.psm.targ Mon Jun 27 10:46:13 2005 -0700 @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -106,6 +106,9 @@ $(ROOT_PSM_CRYPTO_DIR)/%: $(OBJS_DIR)/% $(ROOT_PSM_CRYPTO_DIR) FRC $(INS.file) +$(ROOT_PSM_PCBE_DIR)/%: $(OBJS_DIR)/% $(ROOT_PSM_PCBE_DIR) FRC + $(INS.file) + # # #
--- a/usr/src/pkgdefs/Makefile Sat Jun 25 17:21:41 2005 -0700 +++ b/usr/src/pkgdefs/Makefile Mon Jun 27 10:46:13 2005 -0700 @@ -81,7 +81,6 @@ SUNWstc.u \ SUNWus.u \ SUNWust1.v \ - SUNWust1u.v \ SUNWwrsa.u \ SUNWwrsd.u \ SUNWwrsm.u \
--- a/usr/src/pkgdefs/SUNWust1.v/prototype_com Sat Jun 25 17:21:41 2005 -0700 +++ b/usr/src/pkgdefs/SUNWust1.v/prototype_com Mon Jun 27 10:46:13 2005 -0700 @@ -53,6 +53,9 @@ d none platform/sun4v/kernel/cpu 755 root sys d none platform/sun4v/kernel/cpu/sparcv9 755 root sys f none platform/sun4v/kernel/cpu/sparcv9/SUNW,UltraSPARC-T1 755 root sys +d none platform/sun4v/kernel/pcbe 755 root sys +d none platform/sun4v/kernel/pcbe/sparcv9 755 root sys +f none platform/sun4v/kernel/pcbe/sparcv9/pcbe.SUNW,UltraSPARC-T1 755 root sys d none platform/sun4v/lib 755 root bin d none platform/sun4v/lib/libc_psr 755 root bin
--- a/usr/src/pkgdefs/SUNWust1u.v/Makefile Sat Jun 25 17:21:41 2005 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -# -# 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. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -#pragma ident "%Z%%M% %I% %E% SMI" -# - -include ../Makefile.com - -DATAFILES += i.preserve depend - -.KEEP_STATE: - -all: $(FILES) -install: all pkg - -include ../Makefile.targ
--- a/usr/src/pkgdefs/SUNWust1u.v/pkginfo.tmpl Sat Jun 25 17:21:41 2005 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,55 +0,0 @@ -# -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# 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. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# ident "%Z%%M% %I% %E% SMI" -# -# This required package information file describes characteristics of the -# package, such as package abbreviation, full package name, package version, -# and package architecture. -# -PKG="SUNWust1u" -NAME="UltraSPARC-T1 (User)" -ARCH="sparc.sun4v" -VERSION="ONVERS,REV=0.0.0" -SUNW_PRODNAME="SunOS" -SUNW_PRODVERS="RELEASE/VERSION" -SUNW_PKGTYPE="kvm" -MAXINST="1000" -CATEGORY="system" -DESC="UltraSPARC-T1 CPU utilities" -VENDOR="Sun Microsystems, Inc." -HOTLINE="Please contact your local service provider" -EMAIL="" -CLASSES="none preserve" -BASEDIR=/ -SUNW_PKGVERS="1.0" -SUNW_PKG_ALLZONES="true" -SUNW_PKG_HOLLOW="false" -#VSTOCK="<reserved by Release Engineering for package part #>" -#ISTATES="<developer defined>" -#RSTATES='<developer defined>' -#ULIMIT="<developer defined>" -#ORDER="<developer defined>" -#PSTAMP="<developer defined>" -#INTONLY="<developer defined>"
--- a/usr/src/pkgdefs/SUNWust1u.v/prototype_com Sat Jun 25 17:21:41 2005 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,52 +0,0 @@ -# -# 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. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -#pragma ident "%Z%%M% %I% %E% SMI" -# -# This required package information file contains a list of package contents. -# The 'pkgmk' command uses this file to identify the contents of a package -# and their location on the development machine when building the package. -# Can be created via a text editor or through use of the 'pkgproto' command. - -#!search <pathname pathname ...> # where to find pkg objects -#!include <filename> # include another 'prototype' file -#!default <mode> <owner> <group> # default used if not specified on entry -#!<param>=<value> # puts parameter in pkg environment - -# packaging files -i pkginfo -i copyright -i i.preserve -i depend -# -# source locations relative to the prototype file -# -# SUNWust1u.v -# -d none usr 755 root sys -d none usr/kernel 755 root sys -d none usr/kernel/pcbe 755 root sys -d none usr/kernel/pcbe/sparcv9 755 root sys -f none usr/kernel/pcbe/sparcv9/pcbe.SUNW,UltraSPARC-T1 755 root sys
--- a/usr/src/pkgdefs/SUNWust1u.v/prototype_sparc Sat Jun 25 17:21:41 2005 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,50 +0,0 @@ -# -# 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. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" -# -# This required package information file contains a list of package contents. -# The 'pkgmk' command uses this file to identify the contents of a package -# and their location on the development machine when building the package. -# Can be created via a text editor or through use of the 'pkgproto' command. - -#!search <pathname pathname ...> # where to find pkg objects -#!include <filename> # include another 'prototype' file -#!default <mode> <owner> <group> # default used if not specified on entry -#!<param>=<value> # puts parameter in pkg environment - -# -# Include ISA independent files (prototype_com) -# -!include prototype_com -# -# -# -# List files which are SPARC specific here -# -# source locations relative to the prototype file -# -# SUNWust1u.v -#
--- a/usr/src/tools/scripts/bfu.sh Sat Jun 25 17:21:41 2005 -0700 +++ b/usr/src/tools/scripts/bfu.sh Mon Jun 27 10:46:13 2005 -0700 @@ -5074,6 +5074,7 @@ rm -f $root/platform/sun4u/kernel/misc/sparcv9/pcmcia rm -f $usr/include/v9/sys/traptrace.h rm -f $usr/platform/sun4u/include/sys/spitasi.h + rm -f $usr/kernel/pcbe/sparcv9/pcbe.SUNW,UltraSPARC-T1 # # Remove the IPsec encryption and authentication modules.
--- a/usr/src/uts/common/os/clock.c Sat Jun 25 17:21:41 2005 -0700 +++ b/usr/src/uts/common/os/clock.c Mon Jun 27 10:46:13 2005 -0700 @@ -1964,8 +1964,7 @@ if (tod_faulted != ftype) { switch (ftype) { case TOD_NOFAULT: - if (&plat_tod_fault) - plat_tod_fault(TOD_NOFAULT); + plat_tod_fault(TOD_NOFAULT); cmn_err(CE_NOTE, "Restarted tracking " "Time of Day clock."); tod_faulted = ftype; @@ -1973,8 +1972,7 @@ case TOD_REVERSED: case TOD_JUMPED: if (tod_faulted == TOD_NOFAULT) { - if (&plat_tod_fault) - plat_tod_fault(ftype); + plat_tod_fault(ftype); cmn_err(CE_WARN, "Time of Day clock error: " "reason [%s by 0x%x]. -- " " Stopped tracking Time Of Day clock.", @@ -1985,8 +1983,7 @@ case TOD_STALLED: case TOD_RATECHANGED: if (tod_faulted == TOD_NOFAULT) { - if (&plat_tod_fault) - plat_tod_fault(ftype); + plat_tod_fault(ftype); cmn_err(CE_WARN, "Time of Day clock error: " "reason [%s]. -- " " Stopped tracking Time Of Day clock.",
--- a/usr/src/uts/common/sys/systm.h Sat Jun 25 17:21:41 2005 -0700 +++ b/usr/src/uts/common/sys/systm.h Mon Jun 27 10:46:13 2005 -0700 @@ -137,7 +137,6 @@ extern time_t tod_validate(time_t); extern void tod_fault_reset(void); extern void plat_tod_fault(enum tod_fault_type); -#pragma weak plat_tod_fault #ifndef _LP64 #ifndef min
--- a/usr/src/uts/sun4/os/platmod.c Sat Jun 25 17:21:41 2005 -0700 +++ b/usr/src/uts/sun4/os/platmod.c Mon Jun 27 10:46:13 2005 -0700 @@ -26,6 +26,8 @@ #pragma ident "%Z%%M% %I% %E% SMI" +#include <sys/systm.h> + /* * All platmod functions are weak and are only present when required. * The function calls have been converted to use methods @@ -39,3 +41,9 @@ char *platform_module_list[] = { (char *)0 }; + +/*ARGSUSED*/ +void +plat_tod_fault(enum tod_fault_type tod_bad) +{ +}
--- a/usr/src/uts/sun4v/niagara_pcbe/Makefile Sat Jun 25 17:21:41 2005 -0700 +++ b/usr/src/uts/sun4v/niagara_pcbe/Makefile Mon Jun 27 10:46:13 2005 -0700 @@ -25,7 +25,7 @@ # #ident "%Z%%M% %I% %E% SMI" # -# This Makefile builds the UltraSPARC-H20 Performance Counter BackEnd (PCBE). +# This Makefile builds the UltraSPARC-T1 Performance Counter BackEnd (PCBE). # UTSBASE = ../.. @@ -36,7 +36,7 @@ MODULE = pcbe.SUNW,UltraSPARC-T1 OBJECTS = $(NI_PCBE_OBJS:%=$(OBJS_DIR)/%) LINTS = $(NI_PCBE_OBJS:%.o=$(LINTS_DIR)/%.ln) -ROOTMODULE = $(USR_PCBE_DIR)/$(MODULE) +ROOTMODULE = $(ROOT_PSM_PCBE_DIR)/$(MODULE) # # Include common rules.