From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756306Ab2HNPPu (ORCPT ); Tue, 14 Aug 2012 11:15:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53742 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751765Ab2HNPPt (ORCPT ); Tue, 14 Aug 2012 11:15:49 -0400 Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 From: David Howells In-Reply-To: <502A69FA.8040805@nod.at> References: <502A69FA.8040805@nod.at> <502A6759.3090802@nod.at> <15981.1344955883@warthog.procyon.org.uk> <502A613F.1090600@nod.at> <87a9xys53h.fsf@rustcorp.com.au> <20120726150419.0de645e8750e3a15fa0f1aaa@canb.auug.org.au> <50115FCF.4060708@xenotime.net> <502932A0.3060001@xenotime.net> <15532.1344954413@warthog.procyon.org.uk> <18600.1344956051@warthog.procyon.org.uk> <18933.1344956788@warthog.procyon.org.uk> To: Richard Weinberger Cc: dhowells@redhat.com, Rusty Russell , Randy Dunlap , Stephen Rothwell , linux-next@vger.kernel.org, LKML , user-mode-linux-devel@lists.sourceforge.net Subject: Re: linux-next: Tree for July 26 (uml) Date: Tue, 14 Aug 2012 16:15:28 +0100 Message-ID: <30102.1344957328@warthog.procyon.org.uk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org How about this then? David --- diff --git a/arch/x86/um/Kconfig b/arch/x86/um/Kconfig index 9926e11..a4b0c10 100644 --- a/arch/x86/um/Kconfig +++ b/arch/x86/um/Kconfig @@ -21,9 +21,11 @@ config 64BIT config X86_32 def_bool !64BIT select HAVE_AOUT + select MODULES_USE_ELF_REL config X86_64 def_bool 64BIT + select MODULES_USE_ELF_RELA config RWSEM_XCHGADD_ALGORITHM def_bool X86_XADD && 64BIT