From patchwork Sat Feb 20 15:28:53 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Lo=C3=AFc_Minier?= X-Patchwork-Id: 45922 X-Patchwork-Delegate: apw@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 206D6B7C98 for ; Sun, 21 Feb 2010 02:29:13 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1NirGP-0007t1-OS; Sat, 20 Feb 2010 15:29:01 +0000 Received: from duck.dooz.org ([194.146.227.125]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1NirGN-0007sv-1X for kernel-team@lists.ubuntu.com; Sat, 20 Feb 2010 15:28:59 +0000 Received: from bee.dooz.org (serris.dooz.org [88.166.229.232]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by duck.dooz.org (Postfix) with ESMTP id A29DBC809C; Sat, 20 Feb 2010 16:28:58 +0100 (CET) Received: by bee.dooz.org (Postfix, from userid 1000) id 2BEAE2D60; Sat, 20 Feb 2010 16:28:58 +0100 (CET) From: =?UTF-8?q?Lo=C3=AFc=20Minier?= To: kernel-team@lists.ubuntu.com Subject: [PATCH] UBUNTU: SAUCE: [um] Don't use nx_enabled under UML Date: Sat, 20 Feb 2010 16:28:53 +0100 Message-Id: <1266679733-14452-1-git-send-email-loic.minier@ubuntu.com> X-Mailer: git-send-email 1.7.0 MIME-Version: 1.0 Cc: =?UTF-8?q?Lo=C3=AFc=20Minier?= X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com 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: */