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

Browse source

Pull x86 apic changes from Ingo Molnar:
 "Changes:

   - SGI UV APIC driver updates

   - dead code removal"

* 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/apic/uv: Update the UV APIC HUB check
  x86/apic/uv: Update the UV APIC driver check
  x86/apic/uv: Update the APIC UV OEM check
  x86/apic: Remove verify_local_APIC()

...

This commit is contained in:

Linus Torvalds 2015-04-13 13:15:09 -07:00

parent 7fd56474db 1912c7afa3

commit 977e1ba508

4 changed files with 60 additions and 94 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

1

arch/x86/include/asm/apic.h

View file

62

arch/x86/kernel/apic/apic.c

View file

87

arch/x86/kernel/apic/x2apic_uv_x.c

View file

2

arch/x86/kernel/smpboot.c

View file