From patchwork Fri Oct 30 04:06:38 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Herrenschmidt X-Patchwork-Id: 37241 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id BFDFDB7E36 for ; Fri, 30 Oct 2009 15:07:01 +1100 (EST) Received: by ozlabs.org (Postfix) id 046CDB7C04; Fri, 30 Oct 2009 15:06:55 +1100 (EST) Delivered-To: linuxppc-dev@ozlabs.org Received: from gate.crashing.org (gate.crashing.org [63.228.1.57]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6E2C8B7BAF for ; Fri, 30 Oct 2009 15:06:54 +1100 (EST) Received: from [IPv6:::1] (localhost.localdomain [127.0.0.1]) by gate.crashing.org (8.14.1/8.13.8) with ESMTP id n9U46dZ2003857; Thu, 29 Oct 2009 23:06:40 -0500 Subject: Re: [git pull] Please pull powerpc.git merge branch From: Benjamin Herrenschmidt To: Linus Torvalds In-Reply-To: References: <1256627452.11607.90.camel@pasglop> Date: Fri, 30 Oct 2009 15:06:38 +1100 Message-ID: <1256875598.6372.62.camel@pasglop> Mime-Version: 1.0 X-Mailer: Evolution 2.28.1 Cc: linuxppc-dev list , Andrew Morton , Linux Kernel list X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org On Thu, 2009-10-29 at 09:14 -0700, Linus Torvalds wrote: > > On Tue, 27 Oct 2009, Benjamin Herrenschmidt wrote: > > > > Kumar Gala (7): > > powerpc: Add a Book-3E 64-bit defconfig > > powerpc: Fix compile errors found by new ppc64e_defconfig > > powerpc: Limit hugetlbfs support to PPC64 Book-3S machines > > This is incredibly ugly. Why should the generic fs/Kconfig know about some > random odd architecture detail like PPC_BOOK3S_64? > > I merged it, and noticed this because Super-H caused clashes by cleaning > up. I would suggest PowerPC do the same. > > This patch is not signed-off, nor do I want any credit. But if it works on > ppc, please send me something like this back. Pushed this to my merge branch: (BTW. Where does this SYS_* form comes from ? We had ARCH_ now we have SYS_ * ? Oic... it's a mips thing... oh well no big deal) >From 5a1eb5c4453207ad9e7f6e8ca4f8db289743c993 Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Fri, 30 Oct 2009 15:03:54 +1100 Subject: [PATCH] powerpc: Cleanup Kconfig selection of hugetlbfs support Signed-off-by: Benjamin Herrenschmidt --- arch/powerpc/Kconfig | 4 ++++ fs/Kconfig | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 10a0a54..2ba14e7 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -414,6 +414,10 @@ config ARCH_SPARSEMEM_DEFAULT config ARCH_POPULATES_NODE_MAP def_bool y +config SYS_SUPPORTS_HUGETLBFS + def_bool y + depends on PPC_BOOK3S_64 + source "mm/Kconfig" config ARCH_MEMORY_PROBE diff --git a/fs/Kconfig b/fs/Kconfig index 2126078..64d44ef 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -135,7 +135,7 @@ config TMPFS_POSIX_ACL config HUGETLBFS bool "HugeTLB file system support" - depends on X86 || IA64 || PPC_BOOK3S_64 || SPARC64 || (S390 && 64BIT) || \ + depends on X86 || IA64 || SPARC64 || (S390 && 64BIT) || \ SYS_SUPPORTS_HUGETLBFS || BROKEN help hugetlbfs is a filesystem backing for HugeTLB pages, based on