projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fixes-for-3.6' of git://git.linaro.org/people/mszyprowski/linux-dma...
[cascardo/linux.git]
/
mm
/
mmap.c
diff --git
a/mm/mmap.c
b/mm/mmap.c
index
52e08fc
..
ae18a48
100644
(file)
--- a/
mm/mmap.c
+++ b/
mm/mmap.c
@@
-2308,7
+2308,7
@@
void exit_mmap(struct mm_struct *mm)
}
vm_unacct_memory(nr_accounted);
-
BUG
_ON(mm->nr_ptes > (FIRST_USER_ADDRESS+PMD_SIZE-1)>>PMD_SHIFT);
+
WARN
_ON(mm->nr_ptes > (FIRST_USER_ADDRESS+PMD_SIZE-1)>>PMD_SHIFT);
}
/* Insert vm structure into process list sorted by address