Patchwork UBUNTU: SAUCE: [um] Don't use nx_enabled under UML

login
register
mail settings
Submitter Loïc Minier
Date Feb. 20, 2010, 3:28 p.m.
Message ID <1266679733-14452-1-git-send-email-loic.minier@ubuntu.com>
Download mbox | patch
Permalink /patch/45922/
State Accepted
Delegated to: Andy Whitcroft
Headers show

Comments

Loïc Minier - Feb. 20, 2010, 3:28 p.m.
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>
---
 fs/binfmt_elf.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Andy Whitcroft - Feb. 27, 2010, 8:24 p.m.
Applied to Lucid.

-apw

Patch

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:
 	 */