diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-05 10:54:08 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-05 10:54:08 -0800 |
| commit | 411094acb70f171a111710cf32031c749ffdd28c (patch) | |
| tree | c3e23af4b6a9ac242da85861d59268a8e8812114 /fs | |
| parent | 8fcf4e5a572af520580b14abd9017760e6fcdada (diff) | |
| parent | 89240ba059ca468ae7a8346edf7f95082458c2fc (diff) | |
| download | linux-3.10-411094acb70f171a111710cf32031c749ffdd28c.tar.gz linux-3.10-411094acb70f171a111710cf32031c749ffdd28c.tar.bz2 linux-3.10-411094acb70f171a111710cf32031c749ffdd28c.zip | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, fs: Fix x86 procfs stack information for threads on 64-bit
x86: Add reboot quirk for 3 series Mac mini
x86: Fix printk message typo in mtrr cleanup code
dma-debug: Fix compile warning with PAE enabled
x86/amd-iommu: Un__init function required on shutdown
x86/amd-iommu: Workaround for erratum 63
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/compat.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/compat.c b/fs/compat.c index d576b552e8e..6c19040ffee 100644 --- a/fs/compat.c +++ b/fs/compat.c @@ -1532,6 +1532,8 @@ int compat_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; |