diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 20:37:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 20:37:50 -0700 |
| commit | 10f2a2b0f68abf39c06cf519cbc1740fa50f900b (patch) | |
| tree | 70b33e4437ae0d5ac92f56c60b048756bde7f3e4 /arch/x86/kernel/trampoline.c | |
| parent | 8814011679d1a47d8b0158fc991727a5859471a0 (diff) | |
| parent | b40827fa7268fda8a62490728a61c2856f33830b (diff) | |
| download | blackbird-obmc-linux-10f2a2b0f68abf39c06cf519cbc1740fa50f900b.tar.gz blackbird-obmc-linux-10f2a2b0f68abf39c06cf519cbc1740fa50f900b.zip | |
Merge branch 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86-32, mm: Add an initial page table for core bootstrapping
Diffstat (limited to 'arch/x86/kernel/trampoline.c')
| -rw-r--r-- | arch/x86/kernel/trampoline.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/x86/kernel/trampoline.c b/arch/x86/kernel/trampoline.c index 4c3da5674e67..a375616d77f7 100644 --- a/arch/x86/kernel/trampoline.c +++ b/arch/x86/kernel/trampoline.c @@ -38,19 +38,3 @@ unsigned long __trampinit setup_trampoline(void) memcpy(trampoline_base, trampoline_data, TRAMPOLINE_SIZE); return virt_to_phys(trampoline_base); } - -void __init setup_trampoline_page_table(void) -{ -#ifdef CONFIG_X86_32 - /* Copy kernel address range */ - clone_pgd_range(trampoline_pg_dir + KERNEL_PGD_BOUNDARY, - swapper_pg_dir + KERNEL_PGD_BOUNDARY, - KERNEL_PGD_PTRS); - - /* Initialize low mappings */ - clone_pgd_range(trampoline_pg_dir, - swapper_pg_dir + KERNEL_PGD_BOUNDARY, - min_t(unsigned long, KERNEL_PGD_PTRS, - KERNEL_PGD_BOUNDARY)); -#endif -} |
