diff options
Diffstat (limited to 'arch/um/kernel/mem.c')
-rw-r--r-- | arch/um/kernel/mem.c | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c index 96072e27a0e7..1f8f0c195173 100644 --- a/arch/um/kernel/mem.c +++ b/arch/um/kernel/mem.c | |||
@@ -152,7 +152,7 @@ pgprot_t kmap_prot; | |||
152 | 152 | ||
153 | #define kmap_get_fixmap_pte(vaddr) \ | 153 | #define kmap_get_fixmap_pte(vaddr) \ |
154 | pte_offset_kernel(pmd_offset(pud_offset(pgd_offset_k(vaddr), (vaddr)),\ | 154 | pte_offset_kernel(pmd_offset(pud_offset(pgd_offset_k(vaddr), (vaddr)),\ |
155 | (vaddr)), (vaddr)) | 155 | (vaddr)), (vaddr)) |
156 | 156 | ||
157 | static void __init kmap_init(void) | 157 | static void __init kmap_init(void) |
158 | { | 158 | { |
@@ -278,7 +278,8 @@ struct page *arch_validate(struct page *page, gfp_t mask, int order) | |||
278 | goto again; | 278 | goto again; |
279 | } | 279 | } |
280 | 280 | ||
281 | /* This can't do anything because nothing in the kernel image can be freed | 281 | /* |
282 | * This can't do anything because nothing in the kernel image can be freed | ||
282 | * since it's not in kernel physical memory. | 283 | * since it's not in kernel physical memory. |
283 | */ | 284 | */ |
284 | 285 | ||
@@ -331,9 +332,7 @@ void show_mem(void) | |||
331 | printk("%d pages swap cached\n", cached); | 332 | printk("%d pages swap cached\n", cached); |
332 | } | 333 | } |
333 | 334 | ||
334 | /* | 335 | /* Allocate and free page tables. */ |
335 | * Allocate and free page tables. | ||
336 | */ | ||
337 | 336 | ||
338 | pgd_t *pgd_alloc(struct mm_struct *mm) | 337 | pgd_t *pgd_alloc(struct mm_struct *mm) |
339 | { | 338 | { |
@@ -368,3 +367,15 @@ struct page *pte_alloc_one(struct mm_struct *mm, unsigned long address) | |||
368 | pte = alloc_page(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO); | 367 | pte = alloc_page(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO); |
369 | return pte; | 368 | return pte; |
370 | } | 369 | } |
370 | |||
371 | #ifdef CONFIG_3_LEVEL_PGTABLES | ||
372 | pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address) | ||
373 | { | ||
374 | pmd_t *pmd = (pmd_t *) __get_free_page(GFP_KERNEL); | ||
375 | |||
376 | if (pmd) | ||
377 | memset(pmd, 0, PAGE_SIZE); | ||
378 | |||
379 | return pmd; | ||
380 | } | ||
381 | #endif | ||