Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Browse source

Pull x86 CPU features from Ingo Molnar:
 "Various CPU feature support related changes: in particular the
  /proc/cpuinfo model name sanitization change should be monitored, it
  has a chance to break stuff.  (but really shouldn't and there are no
  regression reports)"

* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/cpu/amd: Give access to the number of nodes in a physical package
  x86/cpu: Trim model ID whitespace
  x86/cpu: Strip any /proc/cpuinfo model name field whitespace
  x86/cpu/amd: Set X86_FEATURE_EXTD_APICID for future processors
  x86/gart: Check for GART support before accessing GART registers

...

This commit is contained in:

Linus Torvalds 2015-06-22 16:43:01 -07:00

parent d43e4f44ba cc2749e409

commit b3ba283d83

6 changed files with 63 additions and 23 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

11

arch/x86/include/asm/amd_nb.h

View file

1

arch/x86/include/asm/processor.h

View file

4

arch/x86/kernel/amd_nb.c

View file

8

arch/x86/kernel/aperture_64.c

View file

35

arch/x86/kernel/cpu/amd.c

View file

27

arch/x86/kernel/cpu/common.c

View file