diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-13 15:15:43 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-13 15:15:43 -0400 |
| commit | 99ad25a313bda566a346b46a6015afa65bc0a02b (patch) | |
| tree | b9443fed1ab74f320c4ee0791864ee96d7c069df /mm/filemap_xip.c | |
| parent | f62c4a96f74d6c6dd56d1742697e94a5c2085e87 (diff) | |
| parent | 9a556e89081b0c1c2f83cee915363b15a68a6f2d (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'mm/filemap_xip.c')
| -rw-r--r-- | mm/filemap_xip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/filemap_xip.c b/mm/filemap_xip.c index 3b6e384b98a6..4553b2c5aab4 100644 --- a/mm/filemap_xip.c +++ b/mm/filemap_xip.c | |||
| @@ -191,7 +191,7 @@ __xip_unmap (struct address_space * mapping, | |||
| 191 | address); | 191 | address); |
| 192 | if (!IS_ERR(pte)) { | 192 | if (!IS_ERR(pte)) { |
| 193 | /* Nuke the page table entry. */ | 193 | /* Nuke the page table entry. */ |
| 194 | flush_cache_page(vma, address, pte_pfn(pte)); | 194 | flush_cache_page(vma, address, pte_pfn(*pte)); |
| 195 | pteval = ptep_clear_flush(vma, address, pte); | 195 | pteval = ptep_clear_flush(vma, address, pte); |
| 196 | BUG_ON(pte_dirty(pteval)); | 196 | BUG_ON(pte_dirty(pteval)); |
| 197 | pte_unmap(pte); | 197 | pte_unmap(pte); |