Mercurial > illumos > illumos-gate
changeset 13114:91026ef504cf
6974188 processor name update for SPARC T3
| author | Vivek Gavaskar <vivek.gavaskar@oracle.COM> |
|---|---|
| date | Fri, 13 Aug 2010 11:07:16 -0700 |
| parents | da7b13ec3a28 |
| children | 17b823d436a7 |
| files | usr/src/pkg/manifests/system-kernel-cpu-sun4v.mf usr/src/uts/sun4v/cpu/niagara2.c usr/src/uts/sun4v/kt/Makefile usr/src/uts/sun4v/kt_pcbe/Makefile usr/src/uts/sun4v/pcbe/niagara2_pcbe.c |
| diffstat | 5 files changed, 13 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/pkg/manifests/system-kernel-cpu-sun4v.mf Fri Aug 13 07:02:57 2010 -0400 +++ b/usr/src/pkg/manifests/system-kernel-cpu-sun4v.mf Fri Aug 13 11:07:16 2010 -0700 @@ -41,22 +41,20 @@ dir path=platform/sun4v/kernel/cpu/$(ARCH64) group=sys dir path=platform/sun4v/kernel/pcbe group=sys dir path=platform/sun4v/kernel/pcbe/$(ARCH64) group=sys +file path=platform/sun4v/kernel/cpu/$(ARCH64)/SPARC-T3 group=sys mode=0755 file path=platform/sun4v/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-T1 group=sys \ mode=0755 file path=platform/sun4v/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-T2 group=sys \ mode=0755 file path=platform/sun4v/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-T2+ group=sys \ mode=0755 -file path=platform/sun4v/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-T3 group=sys \ - mode=0755 file path=platform/sun4v/kernel/pcbe/$(ARCH64)/pcbe.SUNW,UltraSPARC-T1 \ group=sys mode=0755 file path=platform/sun4v/kernel/pcbe/$(ARCH64)/pcbe.SUNW,UltraSPARC-T2 \ group=sys mode=0755 file path=platform/sun4v/kernel/pcbe/$(ARCH64)/pcbe.SUNW,UltraSPARC-T2+ \ group=sys mode=0755 -file path=platform/sun4v/kernel/pcbe/sparcv9/pcbe.SUNW,UltraSPARC-T3 group=sys \ - mode=0755 +file path=platform/sun4v/kernel/pcbe/sparcv9/pcbe.SPARC-T3 group=sys mode=0755 legacy pkg=SUNWust1.v arch=$(ARCH).sun4v \ desc="UltraSPARC-T1 core kernel software" name="UltraSPARC-T1 (Root)" legacy pkg=SUNWust2.v arch=$(ARCH).sun4v \
--- a/usr/src/uts/sun4v/cpu/niagara2.c Fri Aug 13 07:02:57 2010 -0400 +++ b/usr/src/uts/sun4v/cpu/niagara2.c Fri Aug 13 11:07:16 2010 -0700 @@ -20,8 +20,7 @@ */ /* - * Copyright 2010 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. */ #include <sys/types.h> @@ -65,7 +64,7 @@ #elif defined(VFALLS_IMPL) char cpu_module_name[] = "SUNW,UltraSPARC-T2+"; #elif defined(KT_IMPL) -char cpu_module_name[] = "SUNW,UltraSPARC-T3"; +char cpu_module_name[] = "SPARC-T3"; #endif /*
--- a/usr/src/uts/sun4v/kt/Makefile Fri Aug 13 07:02:57 2010 -0400 +++ b/usr/src/uts/sun4v/kt/Makefile Fri Aug 13 11:07:16 2010 -0700 @@ -20,10 +20,9 @@ # # # uts/sun4v/kt/Makefile -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # -# This makefile drives the production of the UltraSPARC-KT cpu module. +# This makefile drives the production of the SPARC-T3 cpu module. # # sun4v implementation architecture dependent # @@ -36,7 +35,7 @@ # # Define the module and object file sets. # -MODULE = SUNW,UltraSPARC-T3 +MODULE = SPARC-T3 OBJECTS = $(NIAGARA2CPU_OBJS:%=$(OBJS_DIR)/%) LINTS = $(NIAGARA2CPU_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_CPU_DIR)/$(MODULE)
--- a/usr/src/uts/sun4v/kt_pcbe/Makefile Fri Aug 13 07:02:57 2010 -0400 +++ b/usr/src/uts/sun4v/kt_pcbe/Makefile Fri Aug 13 11:07:16 2010 -0700 @@ -19,10 +19,9 @@ # CDDL HEADER END # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # -# This Makefile builds the UltraSPARC-KT Performance Counter BackEnd (PCBE). +# This Makefile builds the SPARC-T3 Performance Counter BackEnd (PCBE). # UTSBASE = ../.. @@ -30,7 +29,7 @@ # # Define module and object file sets. # -MODULE = pcbe.SUNW,UltraSPARC-T3 +MODULE = pcbe.SPARC-T3 OBJECTS = $(N2_PCBE_OBJS:%=$(OBJS_DIR)/%) LINTS = $(N2_PCBE_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_PCBE_DIR)/$(MODULE)
--- a/usr/src/uts/sun4v/pcbe/niagara2_pcbe.c Fri Aug 13 07:02:57 2010 -0400 +++ b/usr/src/uts/sun4v/pcbe/niagara2_pcbe.c Fri Aug 13 11:07:16 2010 -0700 @@ -249,8 +249,8 @@ static const char *cpu_pcbe_ref = "See the \"UltraSPARC T2+ User's Manual\" " "for descriptions of these events." CPU_REF_URL; #elif defined(KT_IMPL) -static const char *cpu_impl_name = "UltraSPARC T3"; -static const char *cpu_pcbe_ref = "See the \"UltraSPARC T3 User's Manual\" " +static const char *cpu_impl_name = "SPARC T3"; +static const char *cpu_pcbe_ref = "See the \"SPARC T3 User's Manual\" " "for descriptions of these events." CPU_REF_URL; #endif @@ -820,7 +820,7 @@ #elif defined(VFALLS_IMPL) "UltraSPARC T2+ Performance Counters", #elif defined(KT_IMPL) - "UltraSPARC T3 Performance Counters", + "SPARC T3 Performance Counters", #endif &ni2_pcbe_ops };