diff --git a/[refs] b/[refs]
index e4a45760795c..7aa988f3a30b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 16f8c5b2e64dec7faa5d3c7e9bdf0765e864e481
+refs/heads/master: 07279cdfd964acc032de92a527cb11b1f40f35aa
diff --git a/trunk/mm/swap_state.c b/trunk/mm/swap_state.c
index 167cf2dc8a03..797c3831cbec 100644
--- a/trunk/mm/swap_state.c
+++ b/trunk/mm/swap_state.c
@@ -60,7 +60,7 @@ void show_swap_cache_info(void)
 	printk("Swap cache stats: add %lu, delete %lu, find %lu/%lu\n",
 		swap_cache_info.add_total, swap_cache_info.del_total,
 		swap_cache_info.find_success, swap_cache_info.find_total);
-	printk("Free swap  = %lukB\n", nr_swap_pages << (PAGE_SHIFT - 10));
+	printk("Free swap  = %ldkB\n", nr_swap_pages << (PAGE_SHIFT - 10));
 	printk("Total swap = %lukB\n", total_swap_pages << (PAGE_SHIFT - 10));
 }