diff --git a/[refs] b/[refs] index 2459ae1ff2d2..2c7108a235c5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 36b2528dc1819dc783f69917ac20e66a678b3479 +refs/heads/master: 339aa62469f65daf38a01d6c098b5f3ff8016653 diff --git a/trunk/mm/ksm.c b/trunk/mm/ksm.c index 0113f15ff43b..cf072c54df32 100644 --- a/trunk/mm/ksm.c +++ b/trunk/mm/ksm.c @@ -1263,7 +1263,7 @@ static void ksm_do_scan(unsigned int scan_npages) static int ksm_scan_thread(void *nothing) { - set_user_nice(current, 0); + set_user_nice(current, 5); while (!kthread_should_stop()) { if (ksm_run & KSM_RUN_MERGE) {