svn commit: r351052 - head/sys/conf

[Warner Losh]

Author: imp
Date: Wed Aug 14 20:58:44 2019
New Revision: 351052
URL: https://svnweb.freebsd.org/changeset/base/351052

Log:
  The x86 part of hwpmc is shared, so move it to files.x86.
  
  Reviewed by: jhb (verbal OK on irc)
  Differential Revision: https://reviews.freebsd.org/D21248

Modified:
  head/sys/conf/files.amd64
  head/sys/conf/files.i386
  head/sys/conf/files.x86

Modified: head/sys/conf/files.amd64
==============================================================================
--- head/sys/conf/files.amd64	Wed Aug 14 20:58:39 2019	(r351051)
+++ head/sys/conf/files.amd64	Wed Aug 14 20:58:44 2019	(r351052)
@@ -224,12 +224,6 @@ dev/ixl/i40e_dcb.c		optional	ixl pci \
 	compile-with "${NORMAL_C} -I$S/dev/ixl"
 dev/gpio/bytgpio.c		optional	bytgpio
 dev/gpio/chvgpio.c		optional	chvgpio
-dev/hwpmc/hwpmc_amd.c		optional	hwpmc
-dev/hwpmc/hwpmc_intel.c		optional	hwpmc
-dev/hwpmc/hwpmc_core.c		optional	hwpmc
-dev/hwpmc/hwpmc_uncore.c	optional	hwpmc
-dev/hwpmc/hwpmc_tsc.c		optional	hwpmc
-dev/hwpmc/hwpmc_x86.c		optional	hwpmc
 dev/hyperv/vmbus/amd64/hyperv_machdep.c			optional	hyperv
 dev/hyperv/vmbus/amd64/vmbus_vector.S			optional	hyperv
 dev/nctgpio/nctgpio.c		optional	nctgpio

Modified: head/sys/conf/files.i386
==============================================================================
--- head/sys/conf/files.i386	Wed Aug 14 20:58:39 2019	(r351051)
+++ head/sys/conf/files.i386	Wed Aug 14 20:58:44 2019	(r351052)
@@ -135,12 +135,6 @@ dev/glxsb/glxsb.c		optional glxsb
 dev/glxsb/glxsb_hash.c		optional glxsb
 dev/gpio/bytgpio.c		optional	bytgpio
 dev/gpio/chvgpio.c		optional	chvgpio
-dev/hwpmc/hwpmc_amd.c		optional hwpmc
-dev/hwpmc/hwpmc_intel.c		optional hwpmc
-dev/hwpmc/hwpmc_core.c		optional hwpmc
-dev/hwpmc/hwpmc_uncore.c	optional hwpmc
-dev/hwpmc/hwpmc_tsc.c		optional hwpmc
-dev/hwpmc/hwpmc_x86.c		optional hwpmc
 dev/hyperv/vmbus/i386/hyperv_machdep.c			optional	hyperv
 dev/hyperv/vmbus/i386/vmbus_vector.S			optional	hyperv
 dev/ichwd/ichwd.c		optional ichwd

Modified: head/sys/conf/files.x86
==============================================================================
--- head/sys/conf/files.x86	Wed Aug 14 20:58:39 2019	(r351051)
+++ head/sys/conf/files.x86	Wed Aug 14 20:58:44 2019	(r351052)
@@ -107,6 +107,12 @@ hptrr_lib.o			optional	hptrr			\
 	dependency	"$S/dev/hptrr/$M-elf.hptrr_lib.o.uu"		\
 	compile-with	"uudecode < $S/dev/hptrr/$M-elf.hptrr_lib.o.uu" \
 	no-implicit-rule
+dev/hwpmc/hwpmc_amd.c		optional	hwpmc
+dev/hwpmc/hwpmc_intel.c		optional	hwpmc
+dev/hwpmc/hwpmc_core.c		optional	hwpmc
+dev/hwpmc/hwpmc_uncore.c	optional	hwpmc
+dev/hwpmc/hwpmc_tsc.c		optional	hwpmc
+dev/hwpmc/hwpmc_x86.c		optional	hwpmc
 dev/hyperv/pcib/vmbus_pcib.c				optional	hyperv pci
 dev/hyperv/netvsc/hn_nvs.c				optional	hyperv
 dev/hyperv/netvsc/hn_rndis.c				optional	hyperv