From patchwork Sat Mar 2 19:40:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helge Deller X-Patchwork-Id: 2207401 Return-Path: X-Original-To: patchwork-linux-parisc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id A0BB33FCF2 for ; Sat, 2 Mar 2013 19:41:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752369Ab3CBTlB (ORCPT ); Sat, 2 Mar 2013 14:41:01 -0500 Received: from mout.gmx.net ([212.227.17.20]:50898 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752311Ab3CBTlA (ORCPT ); Sat, 2 Mar 2013 14:41:00 -0500 Received: from mailout-de.gmx.net ([10.1.76.34]) by mrigmx.server.lan (mrigmx001) with ESMTP (Nemesis) id 0LkDzQ-1Ums0f0KDK-00cD7S for ; Sat, 02 Mar 2013 20:40:59 +0100 Received: (qmail invoked by alias); 02 Mar 2013 19:40:58 -0000 Received: from p54AD0163.dip0.t-ipconnect.de (EHLO p100.box) [84.173.1.99] by mail.gmx.net (mp034) with SMTP; 02 Mar 2013 20:40:58 +0100 X-Authenticated: #1045983 X-Provags-ID: V01U2FsdGVkX189wutMsSc96t74V2ksAGZ62HK3SK/uS+xIvqBVqJ r/4LpriUrWcszc Date: Sat, 2 Mar 2013 20:40:53 +0100 From: Helge Deller To: linux-parisc@vger.kernel.org, James Bottomley Subject: parisc: fix redefinition of SET_PERSONALITY Message-ID: <20130302194053.GA873@p100.box> References: <20130227221137.GA2806@p100.box> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20130227221137.GA2806@p100.box> User-Agent: Mutt/1.5.21 (2010-09-15) X-Y-GMX-Trusted: 0 Sender: linux-parisc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org commit cf8e18ea2f8be26e8f9e44ed677d25f558ca301a Author: Helge Deller Date: Sat Mar 2 20:15:28 2013 +0100 commit e72837e3e7bae3f182c4ac63c9424e86f1158dd0 introduced a default SET_PERSONALITY() in include/linux/elf.h. This breaks with our own SET_PERSONALITY define for 32bit userspace on 64bit kernel. Signed-off-by: Helge Deller --- To unsubscribe from this list: send the line "unsubscribe linux-parisc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/parisc/kernel/binfmt_elf32.c b/arch/parisc/kernel/binfmt_elf32.c index f61692d..00dc66f 100644 --- a/arch/parisc/kernel/binfmt_elf32.c +++ b/arch/parisc/kernel/binfmt_elf32.c @@ -85,6 +85,7 @@ struct elf_prpsinfo32 * could set a processor dependent flag in the thread_struct. */ +#undef SET_PERSONALITY #define SET_PERSONALITY(ex) \ set_thread_flag(TIF_32BIT); \ current->thread.map_base = DEFAULT_MAP_BASE32; \