git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into x86/memblock
[pandora-kernel.git]
/
arch
/
x86
/
xen
/
setup.c
diff --git
a/arch/x86/xen/setup.c
b/arch/x86/xen/setup.c
index
38d0af4
..
f5e1362
100644
(file)
--- a/
arch/x86/xen/setup.c
+++ b/
arch/x86/xen/setup.c
@@
-75,7
+75,7
@@
static void __init xen_add_extra_mem(u64 start, u64 size)
if (i == XEN_EXTRA_MEM_MAX_REGIONS)
printk(KERN_WARNING "Warning: not enough extra memory regions\n");
if (i == XEN_EXTRA_MEM_MAX_REGIONS)
printk(KERN_WARNING "Warning: not enough extra memory regions\n");
- memblock_
x86_reserve_range(start, start + size, "XEN EXTRA"
);
+ memblock_
reserve(start, size
);
xen_max_p2m_pfn = PFN_DOWN(start + size);
xen_max_p2m_pfn = PFN_DOWN(start + size);
@@
-299,9
+299,8
@@
char * __init xen_memory_setup(void)
* - xen_start_info
* See comment above "struct start_info" in <xen/interface/xen.h>
*/
* - xen_start_info
* See comment above "struct start_info" in <xen/interface/xen.h>
*/
- memblock_x86_reserve_range(__pa(xen_start_info->mfn_list),
- __pa(xen_start_info->pt_base),
- "XEN START INFO");
+ memblock_reserve(__pa(xen_start_info->mfn_list),
+ xen_start_info->pt_base - xen_start_info->mfn_list);
sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);