From 0d57d2acbe11324688c4801f52703d4c0bb2cfb8 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@redhat.com>
Date: Tue, 7 Sep 2010 19:36:28 -0700
Subject: [PATCH] --- yaml --- r: 210551 b: refs/heads/master c:
 7993bc1f4663c0db67bb8f0d98e6678145b387cd h: refs/heads/master i:   210549:
 5ead5375ef56ecd2a9f0db8c91d89ac03cf4f218   210547:
 a9ab08f7e731d79a2c722be8f30b2eb35ab797e5   210543:
 c2f1580307056e31e9f65b472157575ebd64c565 v: v3

---
 [refs]          | 2 +-
 trunk/fs/exec.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 86fecad5f89d..2905b3be34ec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b528181b2ffa14721fb28ad1bd539fe1732c583
+refs/heads/master: 7993bc1f4663c0db67bb8f0d98e6678145b387cd
diff --git a/trunk/fs/exec.c b/trunk/fs/exec.c
index 1b63237fc6dc..6f2d777431a8 100644
--- a/trunk/fs/exec.c
+++ b/trunk/fs/exec.c
@@ -419,6 +419,8 @@ static int copy_strings(int argc, const char __user *const __user *argv,
 		while (len > 0) {
 			int offset, bytes_to_copy;
 
+			cond_resched();
+
 			offset = pos % PAGE_SIZE;
 			if (offset == 0)
 				offset = PAGE_SIZE;