From 752692aaf0b4650815cde5137023fad5e50b5ecd Mon Sep 17 00:00:00 2001 From: Andrea Arcangeli Date: Thu, 8 Dec 2011 14:33:57 -0800 Subject: [PATCH] --- yaml --- r: 276535 b: refs/heads/master c: 1dfb059b9438633b0546c5431538a47f6ed99028 h: refs/heads/master i: 276533: 42c6bfe2496e5191f4f4b8ab6eb4124523c3becb 276531: 8c3c06490f0f8df62b3503d2ebc30addaeaa3d19 276527: 66cc7b13448382fb9b4db1b597e72aa2e5dde080 v: v3 --- [refs] | 2 +- trunk/mm/huge_memory.c | 16 ++++------------ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 696aea96ba90..befb7b27e02c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b53fc7c2974a50913f49e1d800fe904a28c338e3 +refs/heads/master: 1dfb059b9438633b0546c5431538a47f6ed99028 diff --git a/trunk/mm/huge_memory.c b/trunk/mm/huge_memory.c index 4298abaae153..36b3d988b4ef 100644 --- a/trunk/mm/huge_memory.c +++ b/trunk/mm/huge_memory.c @@ -2259,12 +2259,8 @@ static void khugepaged_do_scan(struct page **hpage) static void khugepaged_alloc_sleep(void) { - DEFINE_WAIT(wait); - add_wait_queue(&khugepaged_wait, &wait); - schedule_timeout_interruptible( - msecs_to_jiffies( - khugepaged_alloc_sleep_millisecs)); - remove_wait_queue(&khugepaged_wait, &wait); + wait_event_freezable_timeout(khugepaged_wait, false, + msecs_to_jiffies(khugepaged_alloc_sleep_millisecs)); } #ifndef CONFIG_NUMA @@ -2313,14 +2309,10 @@ static void khugepaged_loop(void) if (unlikely(kthread_should_stop())) break; if (khugepaged_has_work()) { - DEFINE_WAIT(wait); if (!khugepaged_scan_sleep_millisecs) continue; - add_wait_queue(&khugepaged_wait, &wait); - schedule_timeout_interruptible( - msecs_to_jiffies( - khugepaged_scan_sleep_millisecs)); - remove_wait_queue(&khugepaged_wait, &wait); + wait_event_freezable_timeout(khugepaged_wait, false, + msecs_to_jiffies(khugepaged_scan_sleep_millisecs)); } else if (khugepaged_enabled()) wait_event_freezable(khugepaged_wait, khugepaged_wait_event());