projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge l2-mtd/next into l2-mtd/master
[linux-2.6-block.git]
/
arch
/
metag
/
mm
/
hugetlbpage.c
diff --git
a/arch/metag/mm/hugetlbpage.c
b/arch/metag/mm/hugetlbpage.c
index 3c52fa6d0f8e24030294fecacc26498f5de9ffe5..3c32075d294528df5d8c2493215f34b012ec57f4 100644
(file)
--- a/
arch/metag/mm/hugetlbpage.c
+++ b/
arch/metag/mm/hugetlbpage.c
@@
-173,7
+173,7
@@
new_search:
mm->context.part_huge = 0;
return addr;
}
- if (vma
&& (vma->vm_flags & MAP_HUGETLB)
) {
+ if (vma
->vm_flags & MAP_HUGETLB
) {
/* space after a huge vma in 2nd level page table? */
if (vma->vm_end & HUGEPT_MASK) {
after_huge = 1;