diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-05-19 13:12:41 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-05-19 13:12:41 -0400 |
| commit | 8d0bc2b456103a34c11e01305cd1aed1cde579e5 (patch) | |
| tree | 5e1e6ad55cc9e2b5c5617f6f320114b8cff9e3f3 /fs/compat.c | |
| parent | 30ba3ead05763b172acaa65ae1be71af2a878940 (diff) | |
| parent | e40152ee1e1c7a63f4777791863215e3faa37a86 (diff) | |
Merge commit 'v2.6.34' into next
Diffstat (limited to 'fs/compat.c')
| -rw-r--r-- | fs/compat.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/compat.c b/fs/compat.c index 4b6ed03cc478..05448730f840 100644 --- a/fs/compat.c +++ b/fs/compat.c | |||
| @@ -1531,8 +1531,6 @@ int compat_do_execve(char * filename, | |||
| 1531 | if (retval < 0) | 1531 | if (retval < 0) |
| 1532 | goto out; | 1532 | goto out; |
| 1533 | 1533 | ||
| 1534 | current->stack_start = current->mm->start_stack; | ||
| 1535 | |||
| 1536 | /* execve succeeded */ | 1534 | /* execve succeeded */ |
| 1537 | current->fs->in_exec = 0; | 1535 | current->fs->in_exec = 0; |
| 1538 | current->in_execve = 0; | 1536 | current->in_execve = 0; |