diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2010-05-31 10:58:52 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2010-05-31 10:58:52 -0400 |
commit | ef4afcc4401e92982f4ffd3fae6a9a6745a98596 (patch) | |
tree | 664aba7fdb59ca1c2782c8b8cf35f53e7e5c5c85 /fs/exec.c | |
parent | ac43be5cbbaeb75b43eb2914e089f560f0529e34 (diff) | |
parent | a00123deed0cd4f1bed1bb78e3ec42028384e0b6 (diff) |
Merge stable/linux-2.6.33.y into rt/2.6.33
Conflicts:
Makefile
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'fs/exec.c')
-rw-r--r-- | fs/exec.c | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -1389,8 +1389,6 @@ int do_execve(char * filename, | |||
1389 | if (retval < 0) | 1389 | if (retval < 0) |
1390 | goto out; | 1390 | goto out; |
1391 | 1391 | ||
1392 | current->stack_start = current->mm->start_stack; | ||
1393 | |||
1394 | /* execve succeeded */ | 1392 | /* execve succeeded */ |
1395 | current->fs->in_exec = 0; | 1393 | current->fs->in_exec = 0; |
1396 | current->in_execve = 0; | 1394 | current->in_execve = 0; |