1 files changed, 6 insertions, 4 deletions

diff --git a/mm/swap.c b/mm/swap.c
index 2e0e871f542f..2ed7be39795e 100644
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -57,9 +57,9 @@ static void put_compound_page(struct page *page)
 {
         page = (struct page *)page_private(page);
         if (put_page_testzero(page)) {
-                void (*dtor)(struct page *page);
+                compound_page_dtor *dtor;
 
-                dtor = (void (*)(struct page *))page[1].lru.next;
+                dtor = get_compound_page_dtor(page);
                 (*dtor)(page);
         }
 }
@@ -216,7 +216,7 @@ void lru_add_drain(void)
 }
 
 #ifdef CONFIG_NUMA
-static void lru_add_drain_per_cpu(void *dummy)
+static void lru_add_drain_per_cpu(struct work_struct *dummy)
 {
         lru_add_drain();
 }
@@ -226,7 +226,7 @@ static void lru_add_drain_per_cpu(void *dummy)
  */
 int lru_add_drain_all(void)
 {
-        return schedule_on_each_cpu(lru_add_drain_per_cpu, NULL);
+        return schedule_on_each_cpu(lru_add_drain_per_cpu);
 }
 
 #else
@@ -514,5 +514,7 @@ void __init swap_setup(void)
          * Right now other parts of the system means that we
          * _really_ don't want to cluster much more
          */
+#ifdef CONFIG_HOTPLUG_CPU
         hotcpu_notifier(cpu_swap_callback, 0);
+#endif
 }