diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-02-24 21:52:45 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-24 21:52:45 +0100 |
| commit | 0edcf8d6926f4038443dbc24e319530177ca0353 (patch) | |
| tree | 6010af62f73d01ab673d5106f310eaf4f4228e32 /arch/x86/mm/init_32.c | |
| parent | Merge branch 'x86/core' into core/percpu (diff) | |
| parent | percpu: add __read_mostly to variables which are mostly read only (diff) | |
| download | linux-dev-0edcf8d6926f4038443dbc24e319530177ca0353.tar.xz linux-dev-0edcf8d6926f4038443dbc24e319530177ca0353.zip | |
Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into core/percpu
Conflicts:
arch/x86/include/asm/pgtable.h
Diffstat (limited to 'arch/x86/mm/init_32.c')
| -rw-r--r-- | arch/x86/mm/init_32.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index 06708ee94aa4..ef0bb941cdf5 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c @@ -137,6 +137,23 @@ static pte_t * __init one_page_table_init(pmd_t *pmd) return pte_offset_kernel(pmd, 0); } +pmd_t * __init populate_extra_pmd(unsigned long vaddr) +{ + int pgd_idx = pgd_index(vaddr); + int pmd_idx = pmd_index(vaddr); + + return one_md_table_init(swapper_pg_dir + pgd_idx) + pmd_idx; +} + +pte_t * __init populate_extra_pte(unsigned long vaddr) +{ + int pte_idx = pte_index(vaddr); + pmd_t *pmd; + + pmd = populate_extra_pmd(vaddr); + return one_page_table_init(pmd) + pte_idx; +} + static pte_t *__init page_table_kmap_check(pte_t *pte, pmd_t *pmd, unsigned long vaddr, pte_t *lastpte) { |