Merge branch 'linus' into perf/urgent

Merge reason: we need to fix a non-trivial merge conflict.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
index a8b3cc7d90fe..57c7465e656e 100644
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c
@@ -910,9 +910,9 @@ void flush_dcache_icache_hugepage(struct page *page)
                 if (!PageHighMem(page)) {
                         __flush_dcache_icache(page_address(page+i));
                 } else {
-                        start = kmap_atomic(page+i, KM_PPC_SYNC_ICACHE);
+                        start = kmap_atomic(page+i);
                         __flush_dcache_icache(start);
-                        kunmap_atomic(start, KM_PPC_SYNC_ICACHE);
+                        kunmap_atomic(start);
                 }
         }
 }