diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-18 21:28:28 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-18 21:28:28 +0200 |
commit | 5614e7725856ea383f458377980298111439e0fb (patch) | |
tree | 82560034c3a17ee18073420406ba1228935e2967 /arch/arc/mm/cache.c | |
parent | devcoredump: add scatterlist support (diff) | |
parent | Linux 4.6-rc4 (diff) | |
download | linux-5614e7725856ea383f458377980298111439e0fb.tar.xz linux-5614e7725856ea383f458377980298111439e0fb.zip |
Merge 4.6-rc4 into driver-core-next
We want those fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arc/mm/cache.c')
-rw-r--r-- | arch/arc/mm/cache.c | 2 |
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); |