diff options
| author | David Vrabel <david.vrabel@csr.com> | 2010-02-25 08:35:22 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2010-02-25 08:35:22 -0500 |
| commit | 03806fa20f6a081493a731a4b18ea66317f9f947 (patch) | |
| tree | 630796c65c501e3612253ee4d4af58082a5f984c /fs/binfmt_flat.c | |
| parent | 35fb2a816a06ded2a3ff83d896c34b83c8e1d556 (diff) | |
| parent | baac35c4155a8aa826c70acee6553368ca5243a2 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'fs/binfmt_flat.c')
| -rw-r--r-- | fs/binfmt_flat.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c index d4a00ea1054c..42c6b4a54445 100644 --- a/fs/binfmt_flat.c +++ b/fs/binfmt_flat.c | |||
| @@ -519,6 +519,7 @@ static int load_flat_file(struct linux_binprm * bprm, | |||
| 519 | 519 | ||
| 520 | /* OK, This is the point of no return */ | 520 | /* OK, This is the point of no return */ |
| 521 | set_personality(PER_LINUX_32BIT); | 521 | set_personality(PER_LINUX_32BIT); |
| 522 | setup_new_exec(bprm); | ||
| 522 | } | 523 | } |
| 523 | 524 | ||
| 524 | /* | 525 | /* |