Re: [git pull] Please pull powerpc.git merge branch

Benjamin Herrenschmidt
2009-10-29T23:16:23Z

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.

Right. I noticed the same thing yesterday and planned to do so today

> 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.

I'll stick something like that in my tree and send you a pull request.

Cheers,
Ben.

> 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