From 57df53f4991c83cdffc57d66f75328de182fc69f Mon Sep 17 00:00:00 2001 From: Arjan van de Ven Date: Sun, 10 Dec 2006 02:21:28 -0800 Subject: [PATCH] --- yaml --- r: 44017 b: refs/heads/master c: 2b2842146cb4105877c2be51d3857ec61ebd4ff9 h: refs/heads/master i: 44015: 06289995bd3a59640755c81957b8c3e204e312a7 v: v3 --- [refs] | 2 +- trunk/mm/slab.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 46912f51d243..b8d1e35ba5bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 44d306e1508fef6fa7a6eb15a1aba86ef68389a6 +refs/heads/master: 2b2842146cb4105877c2be51d3857ec61ebd4ff9 diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c index 56af694c9e6a..2c655532f5ef 100644 --- a/trunk/mm/slab.c +++ b/trunk/mm/slab.c @@ -946,7 +946,8 @@ static void __devinit start_cpu_timer(int cpu) if (keventd_up() && reap_work->work.func == NULL) { init_reap_node(cpu); INIT_DELAYED_WORK(reap_work, cache_reap); - schedule_delayed_work_on(cpu, reap_work, HZ + 3 * cpu); + schedule_delayed_work_on(cpu, reap_work, + __round_jiffies_relative(HZ, cpu)); } } @@ -4006,7 +4007,7 @@ static void cache_reap(struct work_struct *unused) if (!mutex_trylock(&cache_chain_mutex)) { /* Give up. Setup the next iteration. */ schedule_delayed_work(&__get_cpu_var(reap_work), - REAPTIMEOUT_CPUC); + round_jiffies_relative(REAPTIMEOUT_CPUC)); return; } @@ -4052,7 +4053,8 @@ static void cache_reap(struct work_struct *unused) next_reap_node(); refresh_cpu_vm_stats(smp_processor_id()); /* Set up the next iteration */ - schedule_delayed_work(&__get_cpu_var(reap_work), REAPTIMEOUT_CPUC); + schedule_delayed_work(&__get_cpu_var(reap_work), + round_jiffies_relative(REAPTIMEOUT_CPUC)); } #ifdef CONFIG_PROC_FS