Merge branch '3.11-fixes' into mips-for-linux-next

1 files changed, 2 insertions, 1 deletions

diff --git a/arch/mips/mm/gup.c b/arch/mips/mm/gup.c
index d4ea5c9c4a93..06ce17c2a905 100644
--- a/arch/mips/mm/gup.c
+++ b/arch/mips/mm/gup.c
@@ -12,6 +12,7 @@
 #include <linux/swap.h>
 #include <linux/hugetlb.h>
 
+#include <asm/cpu-features.h>
 #include <asm/pgtable.h>
 
 static inline pte_t gup_get_pte(pte_t *ptep)
@@ -273,7 +274,7 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write,
         len = (unsigned long) nr_pages << PAGE_SHIFT;
 
         end = start + len;
-        if (end < start)
+        if (end < start || cpu_has_dc_aliases)
                 goto slow_irqon;
 
         /* XXX: batch / limit 'nr' */