diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-11 17:53:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-11 17:53:53 -0400 |
| commit | 871039f02f8ec4ab2e5e9010718caa8e085786f1 (patch) | |
| tree | f0d2b3127fc48c862967d68c46c2d46668137515 /mm/mmu_context.c | |
| parent | e4077e018b5ead3de9951fc01d8bf12eeeeeefed (diff) | |
| parent | 4a1032faac94ebbf647460ae3e06fc21146eb280 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/stmmac/stmmac_main.c
drivers/net/wireless/wl12xx/wl1271_cmd.c
drivers/net/wireless/wl12xx/wl1271_main.c
drivers/net/wireless/wl12xx/wl1271_spi.c
net/core/ethtool.c
net/mac80211/scan.c
Diffstat (limited to 'mm/mmu_context.c')
| -rw-r--r-- | mm/mmu_context.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/mmu_context.c b/mm/mmu_context.c index 0777654147c9..9e82e937000e 100644 --- a/mm/mmu_context.c +++ b/mm/mmu_context.c | |||
| @@ -53,6 +53,7 @@ void unuse_mm(struct mm_struct *mm) | |||
| 53 | struct task_struct *tsk = current; | 53 | struct task_struct *tsk = current; |
| 54 | 54 | ||
| 55 | task_lock(tsk); | 55 | task_lock(tsk); |
| 56 | sync_mm_rss(tsk, mm); | ||
| 56 | tsk->mm = NULL; | 57 | tsk->mm = NULL; |
| 57 | /* active_mm is still 'mm' */ | 58 | /* active_mm is still 'mm' */ |
| 58 | enter_lazy_tlb(mm, tsk); | 59 | enter_lazy_tlb(mm, tsk); |