svn commit: r303696 - head/sys/sys

[Justin Hibbits]

Author: jhibbits
Date: Wed Aug  3 01:46:55 2016
New Revision: 303696
URL: https://svnweb.freebsd.org/changeset/base/303696

Log:
  Remove a duplicate PMC CPU number
  
  CPU number for MPC85XX is a duplicate for E500.  Since we don't support MPC85XX
  "uncore" registers right now, rather than renumbering it simply remove it, and
  it will properly use the E500 CPU ID.

Modified:
  head/sys/sys/pmc.h

Modified: head/sys/sys/pmc.h
==============================================================================
--- head/sys/sys/pmc.h	Wed Aug  3 01:26:02 2016	(r303695)
+++ head/sys/sys/pmc.h	Wed Aug  3 01:46:55 2016	(r303696)
@@ -105,7 +105,6 @@
 	__PMC_CPU(MIPS_74K,     0x202,  "MIPS 74K")		\
 	__PMC_CPU(PPC_7450,     0x300,  "PowerPC MPC7450")	\
 	__PMC_CPU(PPC_E500,     0x340,  "PowerPC e500 Core")	\
-	__PMC_CPU(PPC_MPC85XX,  0x340,  "Freescale PowerPC MPC85XX")	\
 	__PMC_CPU(PPC_970,      0x380,  "IBM PowerPC 970")	\
 	__PMC_CPU(GENERIC, 	0x400,  "Generic")		\
 	__PMC_CPU(ARMV7_CORTEX_A5,	0x500,	"ARMv7 Cortex A5")	\