---

yaml --- r: 176315 b: refs/heads/master c: 536240f h: refs/heads/master i: 176313: 01b0408 176311: 1b0948d v: v3
git-mirror · Dec 15, 2009 · b4b9ed5 · b4b9ed5
1 parent c8f85e6
commit b4b9ed5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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;
 	}
 
 	/*