diff --git a/[refs] b/[refs]
index 8c6da8e09423..e065f555af9b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7124073add4cd04508f9ae3adc2746c61d7e78b
+refs/heads/master: b3dd20709db2cab0da0ade1f246fd6e6ab1396eb
diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c
index e6a3b933517e..23f1fdfdfcf1 100644
--- a/trunk/mm/memory.c
+++ b/trunk/mm/memory.c
@@ -3590,6 +3590,7 @@ static int do_pmd_numa_page(struct mm_struct *mm, struct vm_area_struct *vma,
 		     unsigned long addr, pmd_t *pmdp)
 {
 	BUG();
+	return 0;
 }
 #endif /* CONFIG_NUMA_BALANCING */