Merge branch 'x86/urgent' into perf/core, to pick up dependency

Browse source

We are going to clean up perf's use of magic Intel model numbers,
so merge in the prerequisite commit that adds the model number
defines.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

...

This commit is contained in:

Ingo Molnar 2016-06-08 12:03:16 +02:00

parent b8ab92201a 970442c599

commit 020d704c3e

3 changed files with 73 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

arch/x86/boot/Makefile

View file

68

arch/x86/include/asm/intel-family.h

View file

4

arch/x86/include/asm/msr.h

View file