search for: balloon_timer

...rs/xen/balloon.c +++ b/drivers/xen/balloon.c @@ -99,8 +99,7 @@ static LIST_HEAD(ballooned_pages); /* Main work function, always executed in process context. */ static void balloon_process(struct work_struct *work); -static DECLARE_WORK(balloon_worker, balloon_process); -static struct timer_list balloon_timer; +static DECLARE_DELAYED_WORK(balloon_worker, balloon_process); /* When ballooning out (allocating memory to return to Xen) we don''t really want the kernel to try too hard since that can trigger the oom killer. */ @@ -172,11 +171,6 @@ static struct page *balloon_next_page(struct pag...

...void balloon_process(struct work_struct *work) } while ((credit != 0) && !need_sleep); /* Schedule more work if there is some still to be done. */ - if (current_target() != balloon_stats.current_pages) + if (balloon_stats.target_pages != balloon_stats.current_pages) mod_timer(&balloon_timer, jiffies + HZ); else if (is_memory_resource_reserved()) hotplug_allocated_memory(); diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h index 6652eae..37f1894 100644 --- a/include/linux/memory_hotplug.h +++ b/include/linux/memory_hotplug.h @@ -202,8 +202,7 @@ static in...

...); + } + if (credit < 0) need_sleep = (decrease_reservation(-credit) != 0); @@ -448,93 +574,12 @@ static void balloon_process(struct work_struct *work) /* Schedule more work if there is some still to be done. */ if (current_target() != balloon_stats.current_pages) mod_timer(&balloon_timer, jiffies + HZ); -#ifdef CONFIG_XEN_BALLOON_MEMORY_HOTPLUG - else if (balloon_stats.hotplug_start_paddr) { - nid = memory_add_physaddr_to_nid(balloon_stats.hotplug_start_paddr); - - ret = xen_add_memory(nid, balloon_stats.hotplug_start_paddr, - balloon_stats.hotplug_size); - - if (ret) { -...