diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-12-08 13:20:34 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-12-08 13:20:34 +1100 |
| commit | faa8bf8878636e40646d307e0516dbadb3b65b4f (patch) | |
| tree | 2f9736f1ec827ad80a3fd61af5846e664ded2ab1 /arch/powerpc/mm/mem.c | |
| parent | 48b1bf86c308532669571e929619e98a8d88ef54 (diff) | |
| parent | 1f6820b4c1d09b017625ce32ba23fa39ebfdb27a (diff) | |
| download | linux-stable-faa8bf8878636e40646d307e0516dbadb3b65b4f.tar.gz linux-stable-faa8bf8878636e40646d307e0516dbadb3b65b4f.tar.bz2 linux-stable-faa8bf8878636e40646d307e0516dbadb3b65b4f.zip | |
Merge branch 'booke-hugetlb' into next
Diffstat (limited to 'arch/powerpc/mm/mem.c')
| -rw-r--r-- | arch/powerpc/mm/mem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index 22563b9664c3..83d819f30864 100644 --- a/arch/powerpc/mm/mem.c +++ b/arch/powerpc/mm/mem.c @@ -553,7 +553,7 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long address, #if (defined(CONFIG_PPC_BOOK3E_64) || defined(CONFIG_PPC_FSL_BOOK3E)) \ && defined(CONFIG_HUGETLB_PAGE) if (is_vm_hugetlb_page(vma)) - book3e_hugetlb_preload(vma->vm_mm, address, *ptep); + book3e_hugetlb_preload(vma, address, *ptep); #endif } |