summaryrefslogtreecommitdiffstats
path: root/arch/arc/mm/cache.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2016-04-22 00:32:51 +0200
committerDave Airlie <airlied@redhat.com>2016-04-22 00:32:51 +0200
commit49047962ecf02d76bdaa378c00a51c9b829ac195 (patch)
tree4e711bead6598486b033c4d2dbdb7f7c0dd6f23a /arch/arc/mm/cache.c
parentMerge tag 'topic/drm-misc-2016-04-21' of git://anongit.freedesktop.org/drm-in... (diff)
parentLinux 4.6-rc3 (diff)
downloadlinux-49047962ecf02d76bdaa378c00a51c9b829ac195.tar.xz
linux-49047962ecf02d76bdaa378c00a51c9b829ac195.zip
Merge tag 'v4.6-rc3' into drm-next
Backmerge 4.6-rc3 for i915. Linux 4.6-rc3
Diffstat (limited to 'arch/arc/mm/cache.c')
-rw-r--r--arch/arc/mm/cache.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arc/mm/cache.c b/arch/arc/mm/cache.c
index d7709e3930a3..9e5eddbb856f 100644
--- a/arch/arc/mm/cache.c
+++ b/arch/arc/mm/cache.c
@@ -628,7 +628,7 @@ void flush_dcache_page(struct page *page)
/* kernel reading from page with U-mapping */
phys_addr_t paddr = (unsigned long)page_address(page);
- unsigned long vaddr = page->index << PAGE_CACHE_SHIFT;
+ unsigned long vaddr = page->index << PAGE_SHIFT;
if (addr_not_cache_congruent(paddr, vaddr))
__flush_dcache_page(paddr, vaddr);