diff options
| author | Jens Axboe <axboe@kernel.dk> | 2012-07-30 03:03:10 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2012-07-30 03:03:10 -0400 |
| commit | 72ea1f74fcdf874cca6d2c0962379523bbd99e2c (patch) | |
| tree | 4c67be6c73356086ff44ef1b8b1c9479702689ca /fs/exec.c | |
| parent | b1af9be5ef77898c05667bb9dbf3b180d91d3292 (diff) | |
| parent | a73ff3231df59a4b92ccd0dd4e73897c5822489b (diff) | |
Merge branch 'for-jens' of git://git.drbd.org/linux-drbd into for-3.6/drivers
Diffstat (limited to 'fs/exec.c')
| -rw-r--r-- | fs/exec.c | 2 |
1 files changed, 1 insertions, 1 deletions
| @@ -819,10 +819,10 @@ static int exec_mmap(struct mm_struct *mm) | |||
| 819 | /* Notify parent that we're no longer interested in the old VM */ | 819 | /* Notify parent that we're no longer interested in the old VM */ |
| 820 | tsk = current; | 820 | tsk = current; |
| 821 | old_mm = current->mm; | 821 | old_mm = current->mm; |
| 822 | sync_mm_rss(old_mm); | ||
| 823 | mm_release(tsk, old_mm); | 822 | mm_release(tsk, old_mm); |
| 824 | 823 | ||
| 825 | if (old_mm) { | 824 | if (old_mm) { |
| 825 | sync_mm_rss(old_mm); | ||
| 826 | /* | 826 | /* |
| 827 | * Make sure that if there is a core dump in progress | 827 | * Make sure that if there is a core dump in progress |
| 828 | * for the old mm, we get out and die instead of going | 828 | * for the old mm, we get out and die instead of going |
