9251 p123_pcbe is useless and can be removed

Reviewed by: Toomas Soome <tsoome@me.com> Reviewed by: Peter Tribble <peter.tribble@gmail.com> Approved by: Joshua M. Clulow <josh@sysmgr.org>
illumos · Mar 11, 2018 · b13f152 · b13f152
1 parent 2d63d7e
commit b13f152
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 1,217 deletions.
diff --git a/usr/src/pkg/manifests/diagnostic-cpu-counters.mf b/usr/src/pkg/manifests/diagnostic-cpu-counters.mf
@@ -56,8 +56,6 @@ $(i386_ONLY)file path=usr/kernel/pcbe/$(ARCH64)/pcbe.AuthenticAMD group=sys \
     mode=0755
 $(i386_ONLY)file path=usr/kernel/pcbe/$(ARCH64)/pcbe.GenuineIntel.15 group=sys \
     mode=0755
-$(i386_ONLY)file path=usr/kernel/pcbe/$(ARCH64)/pcbe.GenuineIntel.6 group=sys \
-    mode=0755
 $(i386_ONLY)file path=usr/kernel/pcbe/$(ARCH64)/pcbe.GenuineIntel.6.15 \
     group=sys mode=0755
 file path=usr/lib/$(ARCH64)/libcpc.so.1
@@ -100,8 +98,6 @@ file path=usr/share/man/man3lib/libpctx.3lib
 hardlink path=usr/bin/cputrack target=../lib/isaexec
 $(sparc_ONLY)hardlink path=usr/kernel/pcbe/$(ARCH64)/pcbe.23 target=pcbe.62
 $(sparc_ONLY)hardlink path=usr/kernel/pcbe/$(ARCH64)/pcbe.4.7 target=pcbe.4.6
-$(i386_ONLY)hardlink path=usr/kernel/pcbe/$(ARCH64)/pcbe.GenuineIntel.5 \
-    target=pcbe.GenuineIntel.6
 legacy pkg=SUNWcpcu desc="CPU Performance Counter libraries and utilities" \
     name="CPU Performance Counter libraries and utilities"
 license cr_Sun license=cr_Sun

diff --git a/usr/src/uts/intel/Makefile.files b/usr/src/uts/intel/Makefile.files
@@ -22,7 +22,7 @@
 #
 # Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright (c) 2013, Joyent, Inc. All rights reserved.
-# Copyright 2017 Nexenta Systems, Inc.
+# Copyright 2018 Nexenta Systems, Inc.
 #
 
 #
@@ -235,11 +235,6 @@ SDT_OBJS += sdt.o
 #
 AMD8111S_OBJS += amd8111s_main.o amd8111s_hw.o
 
-#
-#	Pentium Performance Counter BackEnd module
-#
-P123_PCBE_OBJS = p123_pcbe.o
-
 #
 #	Pentium 4 Performance Counter BackEnd module
 #

diff --git a/usr/src/uts/intel/Makefile.intel b/usr/src/uts/intel/Makefile.intel
@@ -23,7 +23,7 @@
 # Copyright (c) 2013 Andrew Stormont.  All rights reserved.
 # Copyright 2016 Joyent, Inc.
 # Copyright 2016 Garrett D'Amore <garrett@damore.org>
-# Copyright 2017 Nexenta Systems, Inc.
+# Copyright 2018 Nexenta Systems, Inc.
 #
 
 #
@@ -699,7 +699,7 @@ GENUNIX_KMODS	+= genunix
 #
 #	Performance Counter BackEnd modules (/usr/kernel/pcbe)
 #
-PCBE_KMODS	+= p123_pcbe p4_pcbe opteron_pcbe core_pcbe
+PCBE_KMODS	+= p4_pcbe opteron_pcbe core_pcbe
 
 #
 #	MAC-Type Plugin Modules (/kernel/mac)

diff --git a/usr/src/uts/intel/p123_pcbe/Makefile b/usr/src/uts/intel/p123_pcbe/Makefile