Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262444AbTEVBlX (ORCPT ); Wed, 21 May 2003 21:41:23 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262445AbTEVBlX (ORCPT ); Wed, 21 May 2003 21:41:23 -0400 Received: from dp.samba.org ([66.70.73.150]:22420 "EHLO lists.samba.org") by vger.kernel.org with ESMTP id S262444AbTEVBlW (ORCPT ); Wed, 21 May 2003 21:41:22 -0400 Date: Thu, 22 May 2003 11:54:28 +1000 From: David Gibson To: Linus Torvalds , Andrew Morton Cc: linux-kernel@vger.kernel.org, Anton Blanchard Subject: Re: [PATCH] rename and extend check_valid_hugepage_range() Message-ID: <20030522015428.GB3720@zax> Mail-Followup-To: David Gibson , Linus Torvalds , Andrew Morton , linux-kernel@vger.kernel.org, Anton Blanchard References: <20030519061525.GA4140@zax> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20030519061525.GA4140@zax> User-Agent: Mutt/1.5.4i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2579 Lines: 69 On Mon, May 19, 2003 at 04:15:25PM +1000, David Gibson wrote: > Linus, please apply: > > check_valid_hugepage_range() is a terrible name, because what it's > actually used to check is whether a range is invalid for normal pages, > rather than whether it's valid for hugepages. It returns 0 > (i.e. normal pages are ok) uniformly on all existing hugepage > implementations. The patch below renames it to > "is_hugepage_only_range()". > > Due to segment insanity, we'll need to override this function for the > ppc64 implementation of hugetlbfs which I'm working on. However, > we'll need access to the mm_struct to do it. This patch also adds > that. Ahem. Except that it was of course, totally broken. And it turns out we don't need the mm, or rather that the approach requiring the mm is insanely hairy. But the name is still terrible, saner patch below. I'll go put my black star on now. diff -urN linux-congo/include/linux/hugetlb.h linux-hugepage/include/linux/hugetlb.h --- linux-congo/include/linux/hugetlb.h 2003-03-10 08:16:21.000000000 +1100 +++ linux-hugepage/include/linux/hugetlb.h 2003-05-21 16:06:26.000000000 +1000 @@ -37,8 +37,8 @@ mm->used_hugetlb = 1; } -#ifndef ARCH_HAS_VALID_HUGEPAGE_RANGE -#define check_valid_hugepage_range(addr, len) 0 +#ifndef ARCH_HAS_HUGEPAGE_ONLY_RANGE +#define is_hugepage_only_range(addr, len) 0 #endif #else /* !CONFIG_HUGETLB_PAGE */ @@ -62,7 +62,7 @@ #define follow_huge_pmd(mm, addr, pmd, write) 0 #define is_aligned_hugepage_range(addr, len) 0 #define pmd_huge(x) 0 -#define check_valid_hugepage_range(addr, len) 0 +#define is_hugepage_only_range(addr, len) 0 #ifndef HPAGE_MASK #define HPAGE_MASK 0 /* Keep the compiler happy */ diff -urN linux-congo/mm/mmap.c linux-hugepage/mm/mmap.c --- linux-congo/mm/mmap.c 2003-04-24 18:54:37.000000000 +1000 +++ linux-hugepage/mm/mmap.c 2003-05-21 16:07:06.000000000 +1000 @@ -829,7 +829,7 @@ * reserved hugepage range. For some archs like IA-64, * there is a separate region for hugepages. */ - ret = check_valid_hugepage_range(addr, len); + ret = is_hugepage_only_range(addr, len); } if (ret) return ret; -- David Gibson | For every complex problem there is a david@gibson.dropbear.id.au | solution which is simple, neat and | wrong. http://www.ozlabs.org/people/dgibson - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/