projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'brcmstb-smp-uart-for-3.19' of http://github.com/brcm/linux into next/soc
[cascardo/linux.git]
/
mm
/
memory.c
diff --git
a/mm/memory.c
b/mm/memory.c
index
1cc6bfb
..
3e50383
100644
(file)
--- a/
mm/memory.c
+++ b/
mm/memory.c
@@
-1147,6
+1147,7
@@
again:
print_bad_pte(vma, addr, ptent, page);
if (unlikely(!__tlb_remove_page(tlb, page))) {
force_flush = 1;
+ addr += PAGE_SIZE;
break;
}
continue;