x86 fixes
Linus,
Please pull the latest x86-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-urgent-for-linus
HEAD: a8aed3e0752b4beb2e37cbed6df69faae88268da x86/mm/pageattr: Prevent PSE and GLOABL leftovers to confuse pmd/pte_present and pmd_huge
Thanks,
Ingo
------------------>
Andrea Arcangeli (2):
Revert "x86, mm: Make spurious_fault check explicitly check explicitly check the PRESENT bit" x86/mm/pageattr: Prevent PSE and GLOABL leftovers to confuse pmd/pte_present and pmd_huge
Mathias Krause (1):
x86/apic: Fix parsing of the 'lapic' cmdline option
Matt Fleming (1):
x86, efi: Make "noefi" really disable EFI runtime serivces
Wen Congyang (1):
x86/mm/numa: Don't check if node is NUMA_NO_NODE
arch/x86/kernel/apic/apic.c | 2 +- arch/x86/mm/fault.c | 8 +------- arch/x86/mm/numa.c | 3 +-- arch/x86/mm/pageattr.c | 50 ++++++++++++++++++++++++++++++++++++++++++--- arch/x86/platform/efi/efi.c | 5 +++-- 5 files changed, 53 insertions(+), 15 deletions(-)
arch/x86/kernel/apic/apic.c +1 -1
@@ -131,7 +131,7 @@ static int __init parse_lapic(char *arg) {if (config_enabled (CONFIG_X86_32 ) && !arg) force_enable_local_apic =1 ; -else if (!strncmp (arg,"notscdeadline" ,13 )) +else if (arg && !strncmp (arg,"notscdeadline" ,13 ))setup_clear_cpu_cap (X86_FEATURE_TSC_DEADLINE_TIMER );return 0 ; }
arch/x86/mm/fault.c +1 -7
@@ -939,14 +939,8 @@ spurious_fault(unsigned long error_code, unsigned long address)if (pmd_large (*pmd))return spurious_fault_check (error_code, (pte_t *) pmd); -/* -* Note: don't use pte_present() here, since it returns true -* if the _PAGE_PROTNONE bit is set. However, this aliases the -* _PAGE_GLOBAL bit, which for kernel pages give false positives -* when CONFIG_DEBUG_PAGEALLOC is used. -*/ pte =pte_offset_kernel (pmd, address); -if (!(pte_flags (*pte) & _PAGE_PRESENT)) +if (!pte_present (*pte))return 0 ; ret =spurious_fault_check (error_code, pte);
arch/x86/mm/numa.c +1 -2
@@ -97,8 +97,7 @@ void __cpuinit numa_set_node(int cpu, int node)#endif per_cpu (x86_cpu_to_node_map, cpu) = node; -if (node !=NUMA_NO_NODE ) -set_cpu_numa_node (cpu, node); +set_cpu_numa_node (cpu, node); }void __cpuinit numa_clear_node (int cpu)
arch/x86/mm/pageattr.c +47 -3
82 lines not on this page · raw message
arch/x86/platform/efi/efi.c +3 -2
@@ -85,9 +85,10 @@ int efi_enabled(int facility) }EXPORT_SYMBOL (efi_enabled); +static bool disable_runtime = false;static int __init setup_noefi (char *arg) { -clear_bit (EFI_RUNTIME_SERVICES , &x86_efi_facility); + disable_runtime = true;return 0 ; }early_param ("noefi" , setup_noefi);
@@ -734,7 +735,7 @@ void __init efi_init(void)if (!efi_is_native ())pr_info ("No EFI runtime due to 32/64-bit mismatch with kernel\n" );else { -if (efi_runtime_init ()) +if (disable_runtime ||efi_runtime_init ())return ;set_bit (EFI_RUNTIME_SERVICES , &x86_efi_facility); }