projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'mmc-v4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
[cascardo/linux.git]
/
arch
/
x86
/
kernel
/
e820.c
diff --git
a/arch/x86/kernel/e820.c
b/arch/x86/kernel/e820.c
index
b85fe5f
..
90e8dde
100644
(file)
--- a/
arch/x86/kernel/e820.c
+++ b/
arch/x86/kernel/e820.c
@@
-350,7
+350,7
@@
int __init sanitize_e820_map(struct e820entry *biosmap, int max_nr_map,
* continue building up new bios map based on this
* information
*/
* continue building up new bios map based on this
* information
*/
- if (current_type != last_type) {
+ if (current_type != last_type
|| current_type == E820_PRAM
) {
if (last_type != 0) {
new_bios[new_bios_entry].size =
change_point[chgidx]->addr - last_addr;
if (last_type != 0) {
new_bios[new_bios_entry].size =
change_point[chgidx]->addr - last_addr;