Merge branches 'topic/asoc', 'topic/misc-fixes' and 'topic/hda' into for-linus

[linux-2.6-omap-h63xx.git] / mm / mlock.c

diff --git a/mm/mlock.c b/mm/mlock.c
index 7b2656055d6a96a6b940574e4d23f0a4fc7dd6bc..01fbe93eff5ca25f1143b1295da6ce7115e00bde 100644 (file)
--- a/mm/mlock.c
+++ b/mm/mlock.c
@@ -78,8 +78,6 @@ success:
 
        mm->locked_vm -= pages;
 out:
-       if (ret == -ENOMEM)
-               ret = -EAGAIN;
        return ret;
 }