diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2014-07-31 09:38:08 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-05 17:55:14 +1000 |
commit | 95cff6e1f49342ce92e12731fa98f7255eb2fab9 (patch) | |
tree | 60405040a4b3a7d5d9f86f03ee0094229085c889 /mm | |
parent | 47fd05c9d5e9f5f9c195781d92256632728f11f3 (diff) |
ksm-provide-support-to-use-deferrable-timers-for-scanner-thread-fix-fix-2
fix build
Cc: Chintan Pandya <cpandya@codeaurora.org>
Cc: Hugh Dickins <hughd@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r-- | mm/ksm.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1720,8 +1720,6 @@ static int ksmd_should_run(void) static int ksm_scan_thread(void *nothing) { - signed long to; - set_freezable(); set_user_nice(current, 5); @@ -1735,7 +1733,9 @@ static int ksm_scan_thread(void *nothing) try_to_freeze(); if (ksmd_should_run()) { - timeout = msecs_to_jiffies(ksm_thread_sleep_millisecs); + signed long to; + + to = msecs_to_jiffies(ksm_thread_sleep_millisecs); if (use_deferrable_timer) schedule_timeout_deferrable_interruptible(to); else |