diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
| commit | a56e74f546b64be93731e42d83baf5b538cc1b11 (patch) | |
| tree | 18f6dee45d801e57ac9db2a31664b0d5c0762c50 /arch/tile/mm/pgtable.c | |
| parent | d08e2e09042bd3f7ef66a35cb4bb92794ab26bb2 (diff) | |
| parent | e4e7f10bfc4069925e99cc4b428c3434e30b6c3f (diff) | |
Merge branch 'arm-aesbs' of git://git.linaro.org/people/ardbiesheuvel/linux-arm into devel-stable
Diffstat (limited to 'arch/tile/mm/pgtable.c')
| -rw-r--r-- | arch/tile/mm/pgtable.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/tile/mm/pgtable.c b/arch/tile/mm/pgtable.c index 2deaddf3e01f..4fd9ec0b58ed 100644 --- a/arch/tile/mm/pgtable.c +++ b/arch/tile/mm/pgtable.c | |||
| @@ -127,8 +127,7 @@ void shatter_huge_page(unsigned long addr) | |||
| 127 | } | 127 | } |
| 128 | 128 | ||
| 129 | /* Shatter the huge page into the preallocated L2 page table. */ | 129 | /* Shatter the huge page into the preallocated L2 page table. */ |
| 130 | pmd_populate_kernel(&init_mm, pmd, | 130 | pmd_populate_kernel(&init_mm, pmd, get_prealloc_pte(pmd_pfn(*pmd))); |
| 131 | get_prealloc_pte(pte_pfn(*(pte_t *)pmd))); | ||
| 132 | 131 | ||
| 133 | #ifdef __PAGETABLE_PMD_FOLDED | 132 | #ifdef __PAGETABLE_PMD_FOLDED |
| 134 | /* Walk every pgd on the system and update the pmd there. */ | 133 | /* Walk every pgd on the system and update the pmd there. */ |