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;