OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7cb00b7
)
x86, efi: Ensure that the entirity of a region is mapped
author
Matthew Garrett
<mjg@redhat.com>
Thu, 5 May 2011 19:19:46 +0000
(15:19 -0400)
committer
H. Peter Anvin
<hpa@linux.intel.com>
Mon, 9 May 2011 19:14:45 +0000
(12:14 -0700)
It's possible for init_memory_mapping() to fail to map the entire region
if it crosses a boundary, so ensure that we complete the mapping.
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Link:
http://lkml.kernel.org/r/1304623186-18261-5-git-send-email-mjg@redhat.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
arch/x86/platform/efi/efi_64.c
patch
|
blob
|
history
diff --git
a/arch/x86/platform/efi/efi_64.c
b/arch/x86/platform/efi/efi_64.c
index
94d6b39
..
2649426
100644
(file)
--- a/
arch/x86/platform/efi/efi_64.c
+++ b/
arch/x86/platform/efi/efi_64.c
@@
-89,8
+89,10
@@
void __iomem *__init efi_ioremap(unsigned long phys_addr, unsigned long size,
return ioremap(phys_addr, size);
last_map_pfn = init_memory_mapping(phys_addr, phys_addr + size);
- if ((last_map_pfn << PAGE_SHIFT) < phys_addr + size)
- return NULL;
+ if ((last_map_pfn << PAGE_SHIFT) < phys_addr + size) {
+ unsigned long top = last_map_pfn << PAGE_SHIFT;
+ efi_ioremap(top, size - (top - phys_addr), type);
+ }
return (void __iomem *)__va(phys_addr);
}