From e65075aadfdc88e201e935a7d7a35d5c2b4b5d71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Minier?= Date: Sat, 20 Feb 2010 16:25:37 +0100 Subject: [PATCH] UBUNTU: SAUCE: [um] Don't use nx_enabled under UML MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- 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 c725752..5ba4a56 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -716,7 +716,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 NX active: */ -- 1.7.0