diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2013-09-04 19:18:07 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2013-09-04 19:18:07 +0200 |
| commit | 4d854194f3e60d56d68e82a934d5613c42c1273b (patch) | |
| tree | 685c39d2c4452f9208240833b13c25e97c2a2c1f /arch/mips/mm | |
| parent | 12d14e0edd4ea7b5fd879e55855969771d37aad8 (diff) | |
| parent | f7c1285f0eba8e0910decc0fa5b409f886e4358e (diff) | |
| download | blackbird-op-linux-4d854194f3e60d56d68e82a934d5613c42c1273b.tar.gz blackbird-op-linux-4d854194f3e60d56d68e82a934d5613c42c1273b.zip | |
Merge branch '3.11-fixes' into mips-for-linux-next
Diffstat (limited to 'arch/mips/mm')
| -rw-r--r-- | arch/mips/mm/gup.c | 3 |
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' */ |
