diff options
| author | Zhang, Yanmin <yanmin.zhang@intel.com> | 2006-02-22 22:07:20 -0500 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2006-03-27 13:15:41 -0500 |
| commit | 5e48521e869de7d904bb5ffe9739258ffa026927 (patch) | |
| tree | 3827383a0a769cac6386bba65915bd6b54c33766 | |
| parent | 64bc0430ee78c03c5c4ce549e217bb74bff7ea5d (diff) | |
[IA64] lazy_mmu_prot_update needs to be aware of huge pages
Function lazy_mmu_prot_update is also used on huge pages when it is called
by set_huge_ptep_writable, but it isn't aware of huge pages.
Signed-off-by: Zhang Yanmin <yanmin.zhang@intel.com>
Acked-by: Ken Chen <kenneth.w.chen@intel.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
| -rw-r--r-- | arch/ia64/mm/init.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c index ff4f31fcd330..674736129b87 100644 --- a/arch/ia64/mm/init.c +++ b/arch/ia64/mm/init.c | |||
| @@ -109,6 +109,7 @@ lazy_mmu_prot_update (pte_t pte) | |||
| 109 | { | 109 | { |
| 110 | unsigned long addr; | 110 | unsigned long addr; |
| 111 | struct page *page; | 111 | struct page *page; |
| 112 | unsigned long order; | ||
| 112 | 113 | ||
| 113 | if (!pte_exec(pte)) | 114 | if (!pte_exec(pte)) |
| 114 | return; /* not an executable page... */ | 115 | return; /* not an executable page... */ |
| @@ -119,7 +120,12 @@ lazy_mmu_prot_update (pte_t pte) | |||
| 119 | if (test_bit(PG_arch_1, &page->flags)) | 120 | if (test_bit(PG_arch_1, &page->flags)) |
| 120 | return; /* i-cache is already coherent with d-cache */ | 121 | return; /* i-cache is already coherent with d-cache */ |
| 121 | 122 | ||
| 122 | flush_icache_range(addr, addr + PAGE_SIZE); | 123 | if (PageCompound(page)) { |
| 124 | order = (unsigned long) (page[1].lru.prev); | ||
| 125 | flush_icache_range(addr, addr + (1UL << order << PAGE_SHIFT)); | ||
| 126 | } | ||
| 127 | else | ||
| 128 | flush_icache_range(addr, addr + PAGE_SIZE); | ||
| 123 | set_bit(PG_arch_1, &page->flags); /* mark page as clean */ | 129 | set_bit(PG_arch_1, &page->flags); /* mark page as clean */ |
| 124 | } | 130 | } |
| 125 | 131 | ||
