diff options
author | J. Bruce Fields <bfields@citi.umich.edu> | 2010-06-08 20:05:18 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@citi.umich.edu> | 2010-06-08 20:05:18 -0400 |
commit | 44b56603c4c476b845a824cff6fe905c6268b2a1 (patch) | |
tree | b7e792414fef2390718a657765719fbbb529ce84 /fs/exec.c | |
parent | c3935e30495869dd611e1cd62253c94ebc7c6c04 (diff) | |
parent | b160fdabe93a8a53094f90f02bf4dcb500782aab (diff) | |
download | op-kernel-dev-44b56603c4c476b845a824cff6fe905c6268b2a1.zip op-kernel-dev-44b56603c4c476b845a824cff6fe905c6268b2a1.tar.gz |
Merge branch 'for-2.6.34-incoming' into for-2.6.35-incoming
Diffstat (limited to 'fs/exec.c')
-rw-r--r-- | fs/exec.c | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -1387,8 +1387,6 @@ int do_execve(char * filename, if (retval < 0) goto out; - current->stack_start = current->mm->start_stack; - /* execve succeeded */ current->fs->in_exec = 0; current->in_execve = 0; |