diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-14 12:30:12 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-14 12:30:12 -0800 |
| commit | 54d5f88f25c38e5500a17b16240cb3775af00876 (patch) | |
| tree | 09208d460e2f5aa93f5d2cdbbb2c5972758994ea /mm/vmscan.c | |
| parent | 76cc43868c1e9d6344ad6c4992c4f6abd5204a8f (diff) | |
| parent | 77b67063bb6bce6d475e910d3b886a606d0d91f7 (diff) | |
Merge v3.7-rc5 into tty-next
This pulls in the 3.7-rc5 fixes into tty-next to make it easier to test.
Diffstat (limited to 'mm/vmscan.c')
| -rw-r--r-- | mm/vmscan.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c index 2624edcfb420..8b055e9379bc 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -3017,6 +3017,8 @@ static int kswapd(void *p) &balanced_classzone_idx); } } + + current->reclaim_state = NULL; return 0; } |