From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751325AbZJ3EGv (ORCPT ); Fri, 30 Oct 2009 00:06:51 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750802AbZJ3EGv (ORCPT ); Fri, 30 Oct 2009 00:06:51 -0400 Received: from gate.crashing.org ([63.228.1.57]:58788 "EHLO gate.crashing.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750794AbZJ3EGu (ORCPT ); Fri, 30 Oct 2009 00:06:50 -0400 Subject: Re: [git pull] Please pull powerpc.git merge branch From: Benjamin Herrenschmidt To: Linus Torvalds Cc: linuxppc-dev list , Andrew Morton , Linux Kernel list In-Reply-To: References: <1256627452.11607.90.camel@pasglop> Content-Type: text/plain; charset="UTF-8" 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 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.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 -- 1.6.1.2.14.gf26b5