lkml.org 
[lkml]   [2012]   [Mar]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH -V3 1/8] hugetlb: rename max_hstate to hugetlb_max_hstate
From
On Tue, Mar 13, 2012 at 3:07 PM, Aneesh Kumar K.V
<aneesh.kumar@linux.vnet.ibm.com> wrote:
> From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
>
> We will be using this from other subsystems like memcg
> in later patches.
>
> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
> ---

Acked-by: Hillf Danton <dhillf@gmail.com>

>  mm/hugetlb.c |   14 +++++++-------
>  1 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/mm/hugetlb.c b/mm/hugetlb.c
> index 5f34bd8..d623e71 100644
> --- a/mm/hugetlb.c
> +++ b/mm/hugetlb.c
> @@ -34,7 +34,7 @@ const unsigned long hugetlb_zero = 0, hugetlb_infinity = ~0UL;
>  static gfp_t htlb_alloc_mask = GFP_HIGHUSER;
>  unsigned long hugepages_treat_as_movable;
>
> -static int max_hstate;
> +static int hugetlb_max_hstate;
>  unsigned int default_hstate_idx;
>  struct hstate hstates[HUGE_MAX_HSTATE];
>
> @@ -46,7 +46,7 @@ static unsigned long __initdata default_hstate_max_huge_pages;
>  static unsigned long __initdata default_hstate_size;
>
>  #define for_each_hstate(h) \
> -       for ((h) = hstates; (h) < &hstates[max_hstate]; (h)++)
> +       for ((h) = hstates; (h) < &hstates[hugetlb_max_hstate]; (h)++)
>
>  /*
>  * Protects updates to hugepage_freelists, nr_huge_pages, and free_huge_pages
> @@ -1808,9 +1808,9 @@ void __init hugetlb_add_hstate(unsigned order)
>                printk(KERN_WARNING "hugepagesz= specified twice, ignoring\n");
>                return;
>        }
> -       BUG_ON(max_hstate >= HUGE_MAX_HSTATE);
> +       BUG_ON(hugetlb_max_hstate >= HUGE_MAX_HSTATE);
>        BUG_ON(order == 0);
> -       h = &hstates[max_hstate++];
> +       h = &hstates[hugetlb_max_hstate++];
>        h->order = order;
>        h->mask = ~((1ULL << (order + PAGE_SHIFT)) - 1);
>        h->nr_huge_pages = 0;
> @@ -1831,10 +1831,10 @@ static int __init hugetlb_nrpages_setup(char *s)
>        static unsigned long *last_mhp;
>
>        /*
> -        * !max_hstate means we haven't parsed a hugepagesz= parameter yet,
> +        * !hugetlb_max_hstate means we haven't parsed a hugepagesz= parameter yet,
>         * so this hugepages= parameter goes to the "default hstate".
>         */
> -       if (!max_hstate)
> +       if (!hugetlb_max_hstate)
>                mhp = &default_hstate_max_huge_pages;
>        else
>                mhp = &parsed_hstate->max_huge_pages;
> @@ -1853,7 +1853,7 @@ static int __init hugetlb_nrpages_setup(char *s)
>         * But we need to allocate >= MAX_ORDER hstates here early to still
>         * use the bootmem allocator.
>         */
> -       if (max_hstate && parsed_hstate->order >= MAX_ORDER)
> +       if (hugetlb_max_hstate && parsed_hstate->order >= MAX_ORDER)
>                hugetlb_hstate_alloc_pages(parsed_hstate);
>
>        last_mhp = mhp;
> --
> 1.7.9
>
--
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/

\
 
 \ /
  Last update: 2012-03-13 14:15    [from the cache]
©2003-2014 Jasper Spaans. Advertise on this site