git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ALSA: pcm: potential uninitialized return values
[pandora-kernel.git]
/
mm
/
mlock.c
diff --git
a/mm/mlock.c
b/mm/mlock.c
index
4f4f53b
..
39b3a7d
100644
(file)
--- a/
mm/mlock.c
+++ b/
mm/mlock.c
@@
-78,6
+78,7
@@
void __clear_page_mlock(struct page *page)
*/
void mlock_vma_page(struct page *page)
{
*/
void mlock_vma_page(struct page *page)
{
+ /* Serialize with page migration */
BUG_ON(!PageLocked(page));
if (!TestSetPageMlocked(page)) {
BUG_ON(!PageLocked(page));
if (!TestSetPageMlocked(page)) {
@@
-105,6
+106,7
@@
void mlock_vma_page(struct page *page)
*/
void munlock_vma_page(struct page *page)
{
*/
void munlock_vma_page(struct page *page)
{
+ /* For try_to_munlock() and to serialize with page migration */
BUG_ON(!PageLocked(page));
if (TestClearPageMlocked(page)) {
BUG_ON(!PageLocked(page));
if (TestClearPageMlocked(page)) {