From patchwork Tue Nov 3 19:46:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Palmer Dabbelt X-Patchwork-Id: 7546671 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4AEF0BEEA4 for ; Tue, 3 Nov 2015 19:50:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 74E3E2051F for ; Tue, 3 Nov 2015 19:50:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9D90120431 for ; Tue, 3 Nov 2015 19:50:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964852AbbKCTtr (ORCPT ); Tue, 3 Nov 2015 14:49:47 -0500 Received: from mail-pa0-f43.google.com ([209.85.220.43]:35043 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932496AbbKCTq4 (ORCPT ); Tue, 3 Nov 2015 14:46:56 -0500 Received: by pasz6 with SMTP id z6so27438737pas.2 for ; Tue, 03 Nov 2015 11:46:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dabbelt_com.20150623.gappssmtp.com; s=20150623; h=from:to:to:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc :cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:subject :date:message-id:in-reply-to:references; bh=bfpHXj0wn5rKYAA3Wz1wWT+IC4CeotniIXZuqv4+yQQ=; b=dw+a1ES70f+VcIc2rUqoHRZGCPV8KJ72jqHYoVlUV1oB66eWIGHJQIi82uCVXt9hD2 UcW/VtzUlwrYrOY3l/ZP3lIhysKUUDm6MlltLqMlWwd5HvgUGh7/HUbrXeD0h6MeGE1h v8t9fYJAmlqiq/Kc7q5TR8HDYFkU1kelI7dmCbxLT+AxI1f9JifemUj98i7+D2tAFvrt EfnALpEDGXFfniE5PtNzbPhlFIum8bAS57F/SPcJoL+mwBEYMlRyBuUiykdk97cmBpWb l/L/nH/2kUC7+nXfr6/HvEHvssQGjuUA143yQ/GXeSj11P6PMZhdcsYfTsk2n4b/6V8b 9Ugg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:to:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc :cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc :cc:cc:cc:cc:subject:date:message-id:in-reply-to:references; bh=bfpHXj0wn5rKYAA3Wz1wWT+IC4CeotniIXZuqv4+yQQ=; b=Uv6dRoA8Os+ce6tSEnaoqvZi+fu9ozHW+/l3/z4CuQ9UnJNa4+4kSmXYRy24ihW1Vx S7tYr3xSQjY6hTXs2Owu4O2M3+b36midN1N+fcku6o+brxNF1jYlUIp9dkMcY+VKUKvh Iw2bqT2emSHkOE0MtXV5gfoXBf5S+pfN/jgflILcWsHZXE3ymgBsW+gUOmWQAZ250k1D rFVQUaCtMSXz1UcIvh2XJOhOtax16DDn+PwPJ3U5qsD/iyE/g9KfMVVUqxTAGmExjgp+ FB+1KFVBXWqqqi52h6K0k3xX2T33eHXUQqEECiaJJKugCA5gH1iQ48tAtalNrzfxbG8C z9XA== X-Gm-Message-State: ALoCoQkXJSpSakk3nj+QVOj+qg/bgyhpSVEUQ5YuM8P+3SlrhukKn1NdmqawnDXvpKdR7ro16nF/ X-Received: by 10.66.163.201 with SMTP id yk9mr3597330pab.107.1446580016037; Tue, 03 Nov 2015 11:46:56 -0800 (PST) Received: from localhost (dhcp-39-103.EECS.Berkeley.EDU. [128.32.39.103]) by smtp.gmail.com with ESMTPSA id d2sm31052837pat.24.2015.11.03.11.46.55 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Nov 2015 11:46:55 -0800 (PST) From: Palmer Dabbelt To: arnd@arndb.de To: dhowells@redhat.com Cc: viro@zeniv.linux.org.uk Cc: ast@plumgrid.com Cc: aishchuk@linux.vnet.ibm.com Cc: aarcange@redhat.com Cc: akpm@linux-foundation.org Cc: luto@kernel.org Cc: acme@kernel.org Cc: bhe@redhat.com Cc: 3chas3@gmail.com Cc: chris@zankel.net Cc: dave@sr71.net Cc: dyoung@redhat.com Cc: drysdale@google.com Cc: davem@davemloft.net Cc: ebiederm@xmission.com Cc: geoff@infradead.org Cc: gregkh@linuxfoundation.org Cc: hpa@zytor.com Cc: mingo@kernel.org Cc: iulia.manda21@gmail.com Cc: plagnioj@jcrosoft.com Cc: jikos@kernel.org Cc: josh@joshtriplett.org Cc: kexec@lists.infradead.org Cc: linux-api@vger.kernel.org Cc: linux-arch@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: linux-xtensa@linux-xtensa.org Cc: mathieu.desnoyers@efficios.com Cc: jcmvbkbc@gmail.com Cc: paulmck@linux.vnet.ibm.com Cc: a.p.zijlstra@chello.nl Cc: tglx@linutronix.de Cc: tomi.valkeinen@ti.com Cc: vgoyal@redhat.com Cc: x86@kernel.org Cc: Palmer Dabbelt Subject: [PATCH 08/13] Move MAX_SHARED_LIBS to fs/binfmt_flat.c Date: Tue, 3 Nov 2015 11:46:29 -0800 Message-Id: <1446579994-9937-9-git-send-email-palmer@dabbelt.com> X-Mailer: git-send-email 2.4.10 In-Reply-To: <1446579994-9937-1-git-send-email-palmer@dabbelt.com> References: <1442271047-4908-1-git-send-email-palmer@dabbelt.com> <1446579994-9937-1-git-send-email-palmer@dabbelt.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP I'm not sure what this is, but it doesn't feel like something that should be exposed to userspace here. I'm assuming this file was exposed for the structure in it, which doesn't depend on MAX_SHARED_LIBS. Signed-off-by: Palmer Dabbelt Reviewed-by: Andrew Waterman Reviewed-by: Albert Ou --- fs/binfmt_flat.c | 6 ++++++ include/uapi/linux/flat.h | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c index f723cd3..e89fb43 100644 --- a/fs/binfmt_flat.c +++ b/fs/binfmt_flat.c @@ -72,6 +72,12 @@ #define RELOC_FAILED 0xff00ff01 /* Relocation incorrect somewhere */ #define UNLOADED_LIB 0x7ff000ff /* Placeholder for unused library */ +#ifdef CONFIG_BINFMT_SHARED_FLAT +#define MAX_SHARED_LIBS (4) +#else +#define MAX_SHARED_LIBS (1) +#endif + struct lib_info { struct { unsigned long start_code; /* Start of text segment */ diff --git a/include/uapi/linux/flat.h b/include/uapi/linux/flat.h index 88cd6ba..1b177c7 100644 --- a/include/uapi/linux/flat.h +++ b/include/uapi/linux/flat.h @@ -13,12 +13,6 @@ #define FLAT_VERSION 0x00000004L -#ifdef CONFIG_BINFMT_SHARED_FLAT -#define MAX_SHARED_LIBS (4) -#else -#define MAX_SHARED_LIBS (1) -#endif - /* * To make everything easier to port and manage cross platform * development, all fields are in network byte order.