Re: [PATCH -V3 1/8] hugetlb: rename max_hstate to hugetlb_max_hstate

[Hillf Danton]

On Tue, Mar 13, 2012 at 3:07 PM, Aneesh Kumar K.V
<aneesh.kumar@xxxxxxxxxxxxxxxxxx> wrote:
> From: "Aneesh Kumar K.V" <aneesh.kumar@xxxxxxxxxxxxxxxxxx>
>
> We will be using this from other subsystems like memcg
> in later patches.
>
> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@xxxxxxxxxxxxxxxxxx>
> ---

Acked-by: Hillf Danton <dhillf@xxxxxxxxx>

> Â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@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/