Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ddcd0973 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

perf/x86/uncore: Rename IvyTown to IvyBridge-EP 



Keeping track of all the various CPU names is hard enough; adding extra
silly names for no reason is just not helping. If we know the base arch
name (IvyBridge) then we can do the client/server parts with the well
known {,EP,EX} postfixes, no need to remember endless amounts of
unrelated and pointless names for this.

Signed-off-by: default avatarPeter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/n/tip-8559jke61dsyr7d0i74iutli@git.kernel.org


Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Yan, Zheng <zheng.z.yan@intel.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 85a16ef6

arch/x86/kernel/cpu/perf_event_intel_uncore.c

+4 −4
Original line number Diff line number Diff line
@@ -880,8 +880,8 @@ static int __init uncore_pci_init(void) 
	case 45: /* Sandy Bridge-EP */

		ret = snbep_uncore_pci_init();

		break;

	case 62: /* IvyTown */

		ret = ivt_uncore_pci_init();

	case 62: /* Ivy Bridge-EP */

		ret = ivbep_uncore_pci_init();

		break;

	case 42: /* Sandy Bridge */

		ret = snb_uncore_pci_init();
@@ -1187,8 +1187,8 @@ static int __init uncore_cpu_init(void) 
	case 47: /* Westmere-EX aka. Xeon E7 */

		nhmex_uncore_cpu_init();

		break;

	case 62: /* IvyTown */

		ivt_uncore_cpu_init();

	case 62: /* Ivy Bridge-EP */

		ivbep_uncore_cpu_init();

		break;



	default:

arch/x86/kernel/cpu/perf_event_intel_uncore.h

+2 −2
Original line number Diff line number Diff line
@@ -330,8 +330,8 @@ void nhm_uncore_cpu_init(void); 
/* perf_event_intel_uncore_snbep.c */

int snbep_uncore_pci_init(void);

void snbep_uncore_cpu_init(void);

int ivt_uncore_pci_init(void);

void ivt_uncore_cpu_init(void);

int ivbep_uncore_pci_init(void);

void ivbep_uncore_cpu_init(void);



/* perf_event_intel_uncore_nhmex.c */

void nhmex_uncore_cpu_init(void);

arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c

+170 −170

File changed.

Preview size limit exceeded, changes collapsed.