Commit 5c0857a9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull one more x86 fix from Peter Anvin:
 "Sigh.  One more patch in the "please don't brick my Samsung" series"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  efi: Clear EFI_RUNTIME_SERVICES rather than EFI_BOOT by "noefi" boot parameter
parents db1b2d32 1de63d60
...@@ -87,7 +87,7 @@ EXPORT_SYMBOL(efi_enabled); ...@@ -87,7 +87,7 @@ EXPORT_SYMBOL(efi_enabled);
static int __init setup_noefi(char *arg) static int __init setup_noefi(char *arg)
{ {
clear_bit(EFI_BOOT, &x86_efi_facility); clear_bit(EFI_RUNTIME_SERVICES, &x86_efi_facility);
return 0; return 0;
} }
early_param("noefi", setup_noefi); early_param("noefi", setup_noefi);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment