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
/
boot
/
compressed
/
eboot.c
diff --git
a/kernel/arch/x86/boot/compressed/eboot.c
b/kernel/arch/x86/boot/compressed/eboot.c
index
48304b8
..
0cdc154
100644
(file)
--- a/
kernel/arch/x86/boot/compressed/eboot.c
+++ b/
kernel/arch/x86/boot/compressed/eboot.c
@@
-1193,6
+1193,10
@@
static efi_status_t setup_e820(struct boot_params *params,
unsigned int e820_type = 0;
unsigned long m = efi->efi_memmap;
+#ifdef CONFIG_X86_64
+ m |= (u64)efi->efi_memmap_hi << 32;
+#endif
+
d = (efi_memory_desc_t *)(m + (i * efi->efi_memdesc_size));
switch (d->type) {
case EFI_RESERVED_TYPE: