diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-14 06:19:59 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-14 06:19:59 -0400 |
| commit | 8d7ccaa545490cdffdfaff0842436a8dd85cf47b (patch) | |
| tree | 8129b5907161bc6ae26deb3645ce1e280c5e1f51 /mm/mlock.c | |
| parent | b2139aa0eec330c711c5a279db361e5ef1178e78 (diff) | |
| parent | 30a2f3c60a84092c8084dfe788b710f8d0768cd4 (diff) | |
Merge commit 'v2.6.27-rc3' into x86/prototypes
Conflicts:
include/asm-x86/dma-mapping.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'mm/mlock.c')
| -rw-r--r-- | mm/mlock.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mm/mlock.c b/mm/mlock.c index 7b2656055d6a..01fbe93eff5c 100644 --- a/mm/mlock.c +++ b/mm/mlock.c | |||
| @@ -78,8 +78,6 @@ success: | |||
| 78 | 78 | ||
| 79 | mm->locked_vm -= pages; | 79 | mm->locked_vm -= pages; |
| 80 | out: | 80 | out: |
| 81 | if (ret == -ENOMEM) | ||
| 82 | ret = -EAGAIN; | ||
| 83 | return ret; | 81 | return ret; |
| 84 | } | 82 | } |
| 85 | 83 | ||