diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-15 20:04:57 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-15 20:04:57 (GMT) |
| commit | 5c0857a9afc74ec83e222ea1b9808988d08139d9 (patch) | |
| tree | fa8344aa83a65a37887a868ce1ad1467c73e3469 | |
| parent | db1b2d323f7914452db5a7071e75f3d159ac6e5d (diff) | |
| parent | 1de63d60cd5b0d33a812efa455d5933bf1564a51 (diff) | |
| download | linux-5c0857a9afc74ec83e222ea1b9808988d08139d9.tar.xz | |
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
| -rw-r--r-- | arch/x86/platform/efi/efi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c index 77cf009..928bf83 100644 --- a/arch/x86/platform/efi/efi.c +++ b/arch/x86/platform/efi/efi.c @@ -87,7 +87,7 @@ EXPORT_SYMBOL(efi_enabled); static int __init setup_noefi(char *arg) { - clear_bit(EFI_BOOT, &x86_efi_facility); + clear_bit(EFI_RUNTIME_SERVICES, &x86_efi_facility); return 0; } early_param("noefi", setup_noefi); |