From patchwork Mon Oct 26 21:59:28 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Mundt X-Patchwork-Id: 55987 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9QLxakx031951 for ; Mon, 26 Oct 2009 21:59:36 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752812AbZJZV7b (ORCPT ); Mon, 26 Oct 2009 17:59:31 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752828AbZJZV7a (ORCPT ); Mon, 26 Oct 2009 17:59:30 -0400 Received: from 124x34x33x190.ap124.ftth.ucom.ne.jp ([124.34.33.190]:38022 "EHLO master.linux-sh.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752812AbZJZV7a (ORCPT ); Mon, 26 Oct 2009 17:59:30 -0400 Received: from localhost (unknown [127.0.0.1]) by master.linux-sh.org (Postfix) with ESMTP id 4F9336377C; Mon, 26 Oct 2009 21:59:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at linux-sh.org Received: from master.linux-sh.org ([127.0.0.1]) by localhost (master.linux-sh.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BOkgNtjenQWs; Tue, 27 Oct 2009 06:59:28 +0900 (JST) Received: by master.linux-sh.org (Postfix, from userid 500) id CAB1D6377E; Tue, 27 Oct 2009 06:59:28 +0900 (JST) Date: Tue, 27 Oct 2009 06:59:28 +0900 From: Paul Mundt To: Kristoffer Ericson Cc: "linux-sh@vger.kernel.org" Subject: Re: Clean config for hp6xx and Hugetlbpage build errors Message-ID: <20091026215928.GC9230@linux-sh.org> References: <20091026201143.a0e55726.kristoffer.ericson@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20091026201143.a0e55726.kristoffer.ericson@gmail.com> User-Agent: Mutt/1.5.13 (2006-08-11) Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 2d3a699..5ac3c0a 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -123,6 +123,9 @@ config SYS_SUPPORTS_APM_EMULATION bool select ARCH_SUSPEND_POSSIBLE +config SYS_SUPPORTS_HUGETLBFS + bool + config SYS_SUPPORTS_SMP bool @@ -197,6 +200,7 @@ config CPU_SH4 select CPU_HAS_SR_RB select CPU_HAS_FPU if !CPU_SH4AL_DSP select SYS_SUPPORTS_TMU + select SYS_SUPPORTS_HUGETLBFS if MMU config CPU_SH4A bool @@ -211,6 +215,7 @@ config CPU_SH5 bool select CPU_HAS_FPU select SYS_SUPPORTS_TMU + select SYS_SUPPORTS_HUGETLBFS if MMU config CPU_SHX2 bool diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig index ca02b72..a5e0867 100644 --- a/arch/sh/mm/Kconfig +++ b/arch/sh/mm/Kconfig @@ -225,7 +225,7 @@ endchoice choice prompt "HugeTLB page size" - depends on HUGETLB_PAGE && (CPU_SH4 || CPU_SH5) && MMU + depends on HUGETLB_PAGE default HUGETLB_PAGE_SIZE_1MB if PAGE_SIZE_64KB default HUGETLB_PAGE_SIZE_64K diff --git a/fs/Kconfig b/fs/Kconfig index d4bf8ca..48b81f9 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -135,8 +135,8 @@ config TMPFS_POSIX_ACL config HUGETLBFS bool "HugeTLB file system support" - depends on X86 || IA64 || PPC64 || SPARC64 || (SUPERH && MMU) || \ - (S390 && 64BIT) || SYS_SUPPORTS_HUGETLBFS || BROKEN + depends on X86 || IA64 || PPC64 || SPARC64 || (S390 && 64BIT) || \ + SYS_SUPPORTS_HUGETLBFS || BROKEN help hugetlbfs is a filesystem backing for HugeTLB pages, based on ramfs. For architectures that support it, say Y here and read