diff options
| author | Loïc Minier <loic.minier@ubuntu.com> | 2010-02-20 05:28:53 +0000 |
|---|---|---|
| committer | Leann Ogasawara <leann.ogasawara@canonical.com> | 2010-08-11 07:39:57 -0700 |
| commit | d36b67cd445229e28dafb79a007eb4c66642a7e0 (patch) | |
| tree | 1e2137900b02558501e39dc7d1b025110dcca1b5 /fs/binfmt_elf.c | |
| parent | 72c0450ebbaa77d224978140bcbdfd50cfacfc39 (diff) | |
UBUNTU: SAUCE: [um] Don't use nx_enabled under UML
This fixes our NX support patch when building for UML which isn't
upstream.
BugLink: http://bugs.launchpad.net/bugs/524849
Signed-off-by: Loïc Minier <loic.minier@ubuntu.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Diffstat (limited to 'fs/binfmt_elf.c')
| -rw-r--r-- | fs/binfmt_elf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index c95463dc7d6..627b826823f 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -724,7 +724,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs) if (retval) goto out_free_dentry; -#ifdef CONFIG_X86_32 +#if defined(CONFIG_X86_32) && !defined(CONFIG_UML) /* * Turn off the CS limit completely if exec-shield disabled or * NX active: |