24aa07882b
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>
42 lines
1.2 KiB
C
42 lines
1.2 KiB
C
#include <linux/io.h>
|
|
#include <linux/memblock.h>
|
|
|
|
#include <asm/trampoline.h>
|
|
#include <asm/cacheflush.h>
|
|
#include <asm/pgtable.h>
|
|
|
|
unsigned char *x86_trampoline_base;
|
|
|
|
void __init setup_trampolines(void)
|
|
{
|
|
phys_addr_t mem;
|
|
size_t size = PAGE_ALIGN(x86_trampoline_end - x86_trampoline_start);
|
|
|
|
/* Has to be in very low memory so we can execute real-mode AP code. */
|
|
mem = memblock_find_in_range(0, 1<<20, size, PAGE_SIZE);
|
|
if (!mem)
|
|
panic("Cannot allocate trampoline\n");
|
|
|
|
x86_trampoline_base = __va(mem);
|
|
memblock_reserve(mem, size);
|
|
|
|
printk(KERN_DEBUG "Base memory trampoline at [%p] %llx size %zu\n",
|
|
x86_trampoline_base, (unsigned long long)mem, size);
|
|
|
|
memcpy(x86_trampoline_base, x86_trampoline_start, size);
|
|
}
|
|
|
|
/*
|
|
* setup_trampolines() gets called very early, to guarantee the
|
|
* availability of low memory. This is before the proper kernel page
|
|
* tables are set up, so we cannot set page permissions in that
|
|
* function. Thus, we use an arch_initcall instead.
|
|
*/
|
|
static int __init configure_trampolines(void)
|
|
{
|
|
size_t size = PAGE_ALIGN(x86_trampoline_end - x86_trampoline_start);
|
|
|
|
set_memory_x((unsigned long)x86_trampoline_base, size >> PAGE_SHIFT);
|
|
return 0;
|
|
}
|
|
arch_initcall(configure_trampolines);
|