diff options
author | Tejun Heo | 2011-07-12 04:16:06 -0500 |
---|---|---|
committer | H. Peter Anvin | 2011-07-14 13:47:53 -0500 |
commit | 24aa07882b672fff2da2f5c955759f0bd13d32d5 (patch) | |
tree | e6dad38048ede1dbb9ad3c7fffcc4b37e72274a8 /arch/x86/kernel/head64.c | |
parent | c378ddd53f9b8832a46fd4fec050a97fc2269858 (diff) | |
download | kernel-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/kernel/head64.c')
-rw-r--r-- | arch/x86/kernel/head64.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c index 5655c2272ad..fd25b11549b 100644 --- a/arch/x86/kernel/head64.c +++ b/arch/x86/kernel/head64.c | |||
@@ -100,7 +100,8 @@ void __init x86_64_start_reservations(char *real_mode_data) | |||
100 | 100 | ||
101 | memblock_init(); | 101 | memblock_init(); |
102 | 102 | ||
103 | memblock_x86_reserve_range(__pa_symbol(&_text), __pa_symbol(&__bss_stop), "TEXT DATA BSS"); | 103 | memblock_reserve(__pa_symbol(&_text), |
104 | __pa_symbol(&__bss_stop) - __pa_symbol(&_text)); | ||
104 | 105 | ||
105 | #ifdef CONFIG_BLK_DEV_INITRD | 106 | #ifdef CONFIG_BLK_DEV_INITRD |
106 | /* Reserve INITRD */ | 107 | /* Reserve INITRD */ |
@@ -109,7 +110,7 @@ void __init x86_64_start_reservations(char *real_mode_data) | |||
109 | unsigned long ramdisk_image = boot_params.hdr.ramdisk_image; | 110 | unsigned long ramdisk_image = boot_params.hdr.ramdisk_image; |
110 | unsigned long ramdisk_size = boot_params.hdr.ramdisk_size; | 111 | unsigned long ramdisk_size = boot_params.hdr.ramdisk_size; |
111 | unsigned long ramdisk_end = PAGE_ALIGN(ramdisk_image + ramdisk_size); | 112 | unsigned long ramdisk_end = PAGE_ALIGN(ramdisk_image + ramdisk_size); |
112 | memblock_x86_reserve_range(ramdisk_image, ramdisk_end, "RAMDISK"); | 113 | memblock_reserve(ramdisk_image, ramdisk_end - ramdisk_image); |
113 | } | 114 | } |
114 | #endif | 115 | #endif |
115 | 116 | ||