Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
arch
/
x86
/
kernel
/
e820.c
diff --git
a/kernel/arch/x86/kernel/e820.c
b/kernel/arch/x86/kernel/e820.c
index
569c1e4
..
52a2526
100644
(file)
--- a/
kernel/arch/x86/kernel/e820.c
+++ b/
kernel/arch/x86/kernel/e820.c
@@
-753,7
+753,7
@@
u64 __init early_reserve_e820(u64 size, u64 align)
/*
* Find the highest page frame number we have available
*/
/*
* Find the highest page frame number we have available
*/
-static unsigned long __init e820_end_pfn(unsigned long limit_pfn)
+static unsigned long __init e820_end_pfn(unsigned long limit_pfn
, unsigned type
)
{
int i;
unsigned long last_pfn = 0;
{
int i;
unsigned long last_pfn = 0;
@@
-764,11
+764,7
@@
static unsigned long __init e820_end_pfn(unsigned long limit_pfn)
unsigned long start_pfn;
unsigned long end_pfn;
unsigned long start_pfn;
unsigned long end_pfn;
- /*
- * Persistent memory is accounted as ram for purposes of
- * establishing max_pfn and mem_map.
- */
- if (ei->type != E820_RAM && ei->type != E820_PRAM)
+ if (ei->type != type)
continue;
start_pfn = ei->addr >> PAGE_SHIFT;
continue;
start_pfn = ei->addr >> PAGE_SHIFT;
@@
-793,12
+789,12
@@
static unsigned long __init e820_end_pfn(unsigned long limit_pfn)
}
unsigned long __init e820_end_of_ram_pfn(void)
{
}
unsigned long __init e820_end_of_ram_pfn(void)
{
- return e820_end_pfn(MAX_ARCH_PFN);
+ return e820_end_pfn(MAX_ARCH_PFN
, E820_RAM
);
}
unsigned long __init e820_end_of_low_ram_pfn(void)
{
}
unsigned long __init e820_end_of_low_ram_pfn(void)
{
- return e820_end_pfn(1UL << (32
-PAGE_SHIFT)
);
+ return e820_end_pfn(1UL << (32
- PAGE_SHIFT), E820_RAM
);
}
static void early_panic(char *msg)
}
static void early_panic(char *msg)