Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
| inline |
side by side
Kernel bump from 4.1.3-rt to 4.1.7-rt.
[kvmfornfv.git]
/
kernel
/
arch
/
x86
/
platform
/
efi
/
efi.c
diff --git
a/kernel/arch/x86/platform/efi/efi.c
b/kernel/arch/x86/platform/efi/efi.c
index
02744df
..
841ea05
100644
(file)
--- a/
kernel/arch/x86/platform/efi/efi.c
+++ b/
kernel/arch/x86/platform/efi/efi.c
@@
-946,6
+946,11
@@
u64 efi_mem_attributes(unsigned long phys_addr)
static int __init arch_parse_efi_cmdline(char *str)
{
+ if (!str) {
+ pr_warn("need at least one option\n");
+ return -EINVAL;
+ }
+
if (parse_option_str(str, "old_map"))
set_bit(EFI_OLD_MEMMAP, &efi.flags);
if (parse_option_str(str, "debug"))