summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--deleted_files/usr/src/pkgdefs/SUNWust1u.v/Makefile (renamed from usr/src/pkgdefs/SUNWust1u.v/Makefile)0
-rw-r--r--deleted_files/usr/src/pkgdefs/SUNWust1u.v/pkginfo.tmpl (renamed from usr/src/pkgdefs/SUNWust1u.v/pkginfo.tmpl)0
-rw-r--r--deleted_files/usr/src/pkgdefs/SUNWust1u.v/prototype_com (renamed from usr/src/pkgdefs/SUNWust1u.v/prototype_com)0
-rw-r--r--deleted_files/usr/src/pkgdefs/SUNWust1u.v/prototype_sparc (renamed from usr/src/pkgdefs/SUNWust1u.v/prototype_sparc)0
-rw-r--r--usr/src/Makefile.psm6
-rw-r--r--usr/src/Makefile.psm.targ5
-rw-r--r--usr/src/pkgdefs/Makefile1
-rw-r--r--usr/src/pkgdefs/SUNWust1.v/prototype_com3
-rw-r--r--usr/src/tools/scripts/bfu.sh1
-rw-r--r--usr/src/uts/common/os/clock.c9
-rw-r--r--usr/src/uts/common/sys/systm.h1
-rw-r--r--usr/src/uts/sun4/os/platmod.c8
-rw-r--r--usr/src/uts/sun4v/niagara_pcbe/Makefile4
13 files changed, 26 insertions, 12 deletions
diff --git a/usr/src/pkgdefs/SUNWust1u.v/Makefile b/deleted_files/usr/src/pkgdefs/SUNWust1u.v/Makefile
index 9ea65561ed..9ea65561ed 100644
--- a/usr/src/pkgdefs/SUNWust1u.v/Makefile
+++ b/deleted_files/usr/src/pkgdefs/SUNWust1u.v/Makefile
diff --git a/usr/src/pkgdefs/SUNWust1u.v/pkginfo.tmpl b/deleted_files/usr/src/pkgdefs/SUNWust1u.v/pkginfo.tmpl
index 32a62201cf..32a62201cf 100644
--- a/usr/src/pkgdefs/SUNWust1u.v/pkginfo.tmpl
+++ b/deleted_files/usr/src/pkgdefs/SUNWust1u.v/pkginfo.tmpl
diff --git a/usr/src/pkgdefs/SUNWust1u.v/prototype_com b/deleted_files/usr/src/pkgdefs/SUNWust1u.v/prototype_com
index f5fdbd7636..f5fdbd7636 100644
--- a/usr/src/pkgdefs/SUNWust1u.v/prototype_com
+++ b/deleted_files/usr/src/pkgdefs/SUNWust1u.v/prototype_com
diff --git a/usr/src/pkgdefs/SUNWust1u.v/prototype_sparc b/deleted_files/usr/src/pkgdefs/SUNWust1u.v/prototype_sparc
index 24b479414b..24b479414b 100644
--- a/usr/src/pkgdefs/SUNWust1u.v/prototype_sparc
+++ b/deleted_files/usr/src/pkgdefs/SUNWust1u.v/prototype_sparc
diff --git a/usr/src/Makefile.psm b/usr/src/Makefile.psm
index b242148298..7528b5af60 100644
--- a/usr/src/Makefile.psm
+++ b/usr/src/Makefile.psm
@@ -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_TOD_DIR_32 = $(ROOT_PSM_MOD_DIR)/tod
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_TOD_DIR_64 = $(ROOT_PSM_MOD_DIR)/tod/$(SUBDIR64)
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_TOD_DIR = $(ROOT_PSM_TOD_DIR_$(CLASS))
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_TOD_DIR_32)
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
diff --git a/usr/src/Makefile.psm.targ b/usr/src/Makefile.psm.targ
index 9c0e149aa2..5c70a081ef 100644
--- a/usr/src/Makefile.psm.targ
+++ b/usr/src/Makefile.psm.targ
@@ -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_DACF_DIR)/%: $(OBJS_DIR)/% $(ROOT_PSM_DACF_DIR) FRC
$(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)
+
#
#
#
diff --git a/usr/src/pkgdefs/Makefile b/usr/src/pkgdefs/Makefile
index c151c389aa..83964fe243 100644
--- a/usr/src/pkgdefs/Makefile
+++ b/usr/src/pkgdefs/Makefile
@@ -81,7 +81,6 @@ sparc_SUBDIRS= \
SUNWstc.u \
SUNWus.u \
SUNWust1.v \
- SUNWust1u.v \
SUNWwrsa.u \
SUNWwrsd.u \
SUNWwrsm.u \
diff --git a/usr/src/pkgdefs/SUNWust1.v/prototype_com b/usr/src/pkgdefs/SUNWust1.v/prototype_com
index b8c5146066..d4ee59060b 100644
--- a/usr/src/pkgdefs/SUNWust1.v/prototype_com
+++ b/usr/src/pkgdefs/SUNWust1.v/prototype_com
@@ -53,6 +53,9 @@ d none platform/sun4v/kernel 755 root sys
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
diff --git a/usr/src/tools/scripts/bfu.sh b/usr/src/tools/scripts/bfu.sh
index eac1b994bb..8b07de8f85 100644
--- a/usr/src/tools/scripts/bfu.sh
+++ b/usr/src/tools/scripts/bfu.sh
@@ -5074,6 +5074,7 @@ mondo_loop() {
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.
diff --git a/usr/src/uts/common/os/clock.c b/usr/src/uts/common/os/clock.c
index d3a2552446..67379ca827 100644
--- a/usr/src/uts/common/os/clock.c
+++ b/usr/src/uts/common/os/clock.c
@@ -1964,8 +1964,7 @@ tod_fault(enum tod_fault_type ftype, int off)
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 @@ tod_fault(enum tod_fault_type ftype, int off)
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 @@ tod_fault(enum tod_fault_type ftype, int off)
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.",
diff --git a/usr/src/uts/common/sys/systm.h b/usr/src/uts/common/sys/systm.h
index 2580be035c..6576e0b657 100644
--- a/usr/src/uts/common/sys/systm.h
+++ b/usr/src/uts/common/sys/systm.h
@@ -137,7 +137,6 @@ enum tod_fault_type {
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
diff --git a/usr/src/uts/sun4/os/platmod.c b/usr/src/uts/sun4/os/platmod.c
index 433c5e796f..fd4cea9e22 100644
--- a/usr/src/uts/sun4/os/platmod.c
+++ b/usr/src/uts/sun4/os/platmod.c
@@ -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)
+{
+}
diff --git a/usr/src/uts/sun4v/niagara_pcbe/Makefile b/usr/src/uts/sun4v/niagara_pcbe/Makefile
index 84775678f0..36ea500982 100644
--- a/usr/src/uts/sun4v/niagara_pcbe/Makefile
+++ b/usr/src/uts/sun4v/niagara_pcbe/Makefile
@@ -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 @@ UTSBASE = ../..
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.
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-28 15:59:46 +0000