From patchwork Thu Oct 29 16:14:37 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Torvalds X-Patchwork-Id: 37202 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 AFB15B7C81 for ; Fri, 30 Oct 2009 03:15:38 +1100 (EST) Received: by ozlabs.org (Postfix) id 76689B7C12; Fri, 30 Oct 2009 03:15:31 +1100 (EST) Delivered-To: linuxppc-dev@ozlabs.org Received: from smtp1.linux-foundation.org (smtp1.linux-foundation.org [140.211.169.13]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "smtp.linux-foundation.org", Issuer "CA Cert Signing Authority" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id 10B12B7C11 for ; Fri, 30 Oct 2009 03:15:30 +1100 (EST) Received: from imap1.linux-foundation.org (imap1.linux-foundation.org [140.211.169.55]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id n9TGEbYD017183 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 29 Oct 2009 09:14:38 -0700 Received: from localhost (localhost [127.0.0.1]) by imap1.linux-foundation.org (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id n9TGEblg006366; Thu, 29 Oct 2009 09:14:37 -0700 Date: Thu, 29 Oct 2009 09:14:37 -0700 (PDT) From: Linus Torvalds X-X-Sender: torvalds@localhost.localdomain To: Benjamin Herrenschmidt Subject: Re: [git pull] Please pull powerpc.git merge branch In-Reply-To: <1256627452.11607.90.camel@pasglop> Message-ID: References: <1256627452.11607.90.camel@pasglop> User-Agent: Alpine 2.01 (LFD 1184 2008-12-16) MIME-Version: 1.0 X-Spam-Status: No, hits=-3.962 required=5 tests=AWL, BAYES_00, OSDL_HEADER_SUBJECT_BRACKETED X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__ X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.13 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 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. Linus --- arch/powerpc/Kconfig | 3 +++ fs/Kconfig | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 10a0a54..877db84 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -131,6 +131,9 @@ config PPC select GENERIC_ATOMIC64 if PPC32 select HAVE_PERF_EVENTS +config SYS_SUPPORTS_HUGETLBFS + defbool PPC_BOOK3S_64 + config EARLY_PRINTK bool default y 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