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-06 16:44:53 +1000 |
commit | a09db33e294bb56b1cab34892fdb94b37096234a (patch) | |
tree | 1bcbd952e22e9fbd79c5e6276aae55e420ad0826 | |
parent | acdc59412b37ba0330ab1a3839601a8a6807208b (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>
-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 |