diff --git a/[refs] b/[refs]
index aa0e1515e593..7791c9d14ef3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3cc668f4e30fbd97b3c0574d8cac7a83903c9bc7
+refs/heads/master: 661c4cb9b829110cb68c18ea05a56be39f75a4d2
diff --git a/trunk/mm/compaction.c b/trunk/mm/compaction.c
index 78075a268399..b16dd3822995 100644
--- a/trunk/mm/compaction.c
+++ b/trunk/mm/compaction.c
@@ -926,6 +926,8 @@ int sysctl_extfrag_threshold = 500;
  * @gfp_mask: The GFP mask of the current allocation
  * @nodemask: The allowed nodes to allocate from
  * @sync: Whether migration is synchronous or not
+ * @contended: Return value that is true if compaction was aborted due to lock contention
+ * @page: Optionally capture a free page of the requested order during compaction
  *
  * This is the main entry point for direct page compaction.
  */