Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

powerpc: import a fix from arch/ppc/mm/pgtable.c

... namely, the change to the 2-argument pte_alloc_kernel.

Signed-off-by: Paul Mackerras <paulus@samba.org>

+1 -3
+1 -3
arch/powerpc/mm/pgtable_32.c
··· 279 279 pte_t *pg; 280 280 int err = -ENOMEM; 281 281 282 - spin_lock(&init_mm.page_table_lock); 283 282 /* Use upper 10 bits of VA to index the first level map */ 284 283 pd = pmd_offset(pgd_offset_k(va), va); 285 284 /* Use middle 10 bits of VA to index the second-level map */ 286 - pg = pte_alloc_kernel(&init_mm, pd, va); 285 + pg = pte_alloc_kernel(pd, va); 287 286 if (pg != 0) { 288 287 err = 0; 289 288 set_pte_at(&init_mm, va, pg, pfn_pte(pa >> PAGE_SHIFT, __pgprot(flags))); 290 289 if (mem_init_done) 291 290 flush_HPTE(0, va, pmd_val(*pd)); 292 291 } 293 - spin_unlock(&init_mm.page_table_lock); 294 292 return err; 295 293 } 296 294