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

Browse source

Pull x86 fixes from Ingo Molnar.

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mm/pageattr: Prevent PSE and GLOABL leftovers to confuse pmd/pte_present and pmd_huge
  Revert "x86, mm: Make spurious_fault check explicitly check explicitly check the PRESENT bit"
  x86/mm/numa: Don't check if node is NUMA_NO_NODE
  x86, efi: Make "noefi" really disable EFI runtime serivces
  x86/apic: Fix parsing of the 'lapic' cmdline option

...

This commit is contained in:

Linus Torvalds 2013-02-26 19:45:29 -08:00

parent 24e55910e4 a8aed3e075

commit 2003cd90c4

5 changed files with 53 additions and 15 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

2

arch/x86/kernel/apic/apic.c

View file

8

arch/x86/mm/fault.c

View file

3

arch/x86/mm/numa.c

View file

50

arch/x86/mm/pageattr.c

View file

5

arch/x86/platform/efi/efi.c

View file