diff --git a/[refs] b/[refs]
index 5a7c888c8141..270e0a2b1fda 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6927c1dd93fc982140f3a3742ac4b224cd3e02b2
+refs/heads/master: 536240f2bde98216feac87b4891d19a536b8884a
diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c
index 6df8065039eb..65f38c218207 100644
--- a/trunk/mm/hugetlb.c
+++ b/trunk/mm/hugetlb.c
@@ -1278,6 +1278,9 @@ static unsigned long set_max_huge_pages(struct hstate *h, unsigned long count,
 		if (!ret)
 			goto out;
 
+		/* Bail for signals. Probably ctrl-c from user */
+		if (signal_pending(current))
+			goto out;
 	}
 
 	/*