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

Loïc Minier loic.minier at ubuntu.com
Sat Feb 20 15:28:53 UTC 2010


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 at ubuntu.com>
---
 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





More information about the kernel-team mailing list