From 63efd2e9c2fb3564e3318e070a16cdb6b2866d53 Mon Sep 17 00:00:00 2001 From: David Howells Date: Mon, 22 Aug 2011 14:09:28 +0100 Subject: [PATCH] --- yaml --- r: 264510 b: refs/heads/master c: d199798bdf969873f78d48140600ff0a98a87e69 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/security/keys/gc.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c2ad411e54f7..f822cf9a3e19 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b072e9bc2fe9aeff4e104e80e479160349f474a9 +refs/heads/master: d199798bdf969873f78d48140600ff0a98a87e69 diff --git a/trunk/security/keys/gc.c b/trunk/security/keys/gc.c index b23db3fbb32d..d67e88b791f2 100644 --- a/trunk/security/keys/gc.c +++ b/trunk/security/keys/gc.c @@ -51,7 +51,7 @@ void key_schedule_gc(time_t gc_at) kenter("%ld", gc_at - now); if (gc_at <= now) { - schedule_work(&key_gc_work); + queue_work(system_nrt_wq, &key_gc_work); } else if (gc_at < key_gc_next_run) { expires = jiffies + (gc_at - now) * HZ; mod_timer(&key_gc_timer, expires); @@ -65,7 +65,7 @@ static void key_gc_timer_func(unsigned long data) { kenter(""); key_gc_next_run = LONG_MAX; - schedule_work(&key_gc_work); + queue_work(system_nrt_wq, &key_gc_work); } /* @@ -206,7 +206,7 @@ static void key_gc_dead_links(struct work_struct *work) key_gc_new_timer = new_timer; key_gc_again = true; clear_bit(0, &key_gc_executing); - schedule_work(&key_gc_work); + queue_work(system_nrt_wq, &key_gc_work); kleave(" [continue]"); return;