aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTejun Heo2011-07-12 04:16:06 -0500
committerH. Peter Anvin2011-07-14 13:47:53 -0500
commit24aa07882b672fff2da2f5c955759f0bd13d32d5 (patch)
treee6dad38048ede1dbb9ad3c7fffcc4b37e72274a8 /arch/x86/xen/setup.c
parentc378ddd53f9b8832a46fd4fec050a97fc2269858 (diff)
downloadkernel-common-24aa07882b672fff2da2f5c955759f0bd13d32d5.tar.gz
kernel-common-24aa07882b672fff2da2f5c955759f0bd13d32d5.tar.xz
kernel-common-24aa07882b672fff2da2f5c955759f0bd13d32d5.zip
memblock, x86: Replace memblock_x86_reserve/free_range() with generic ones
Other than sanity check and debug message, the x86 specific version of memblock reserve/free functions are simple wrappers around the generic versions - memblock_reserve/free(). This patch adds debug messages with caller identification to the generic versions and replaces x86 specific ones and kills them. arch/x86/include/asm/memblock.h and arch/x86/mm/memblock.c are empty after this change and removed. Signed-off-by: Tejun Heo <tj@kernel.org> Link: http://lkml.kernel.org/r/1310462166-31469-14-git-send-email-tj@kernel.org Cc: Yinghai Lu <yinghai@kernel.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/xen/setup.c')
-rw-r--r--arch/x86/xen/setup.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
index 60aeeb56948..73daaf75801 100644
--- a/arch/x86/xen/setup.c
+++ b/arch/x86/xen/setup.c
@@ -63,7 +63,7 @@ static void __init xen_add_extra_mem(unsigned long pages)
63 e820_add_region(extra_start, size, E820_RAM); 63 e820_add_region(extra_start, size, E820_RAM);
64 sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map); 64 sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
65 65
66 memblock_x86_reserve_range(extra_start, extra_start + size, "XEN EXTRA"); 66 memblock_reserve(extra_start, size);
67 67
68 xen_extra_mem_size += size; 68 xen_extra_mem_size += size;
69 69
@@ -287,9 +287,8 @@ char * __init xen_memory_setup(void)
287 * - xen_start_info 287 * - xen_start_info
288 * See comment above "struct start_info" in <xen/interface/xen.h> 288 * See comment above "struct start_info" in <xen/interface/xen.h>
289 */ 289 */
290 memblock_x86_reserve_range(__pa(xen_start_info->mfn_list), 290 memblock_reserve(__pa(xen_start_info->mfn_list),
291 __pa(xen_start_info->pt_base), 291 xen_start_info->pt_base - xen_start_info->mfn_list);
292 "XEN START INFO");
293 292
294 sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map); 293 sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
295 294