hugetlb: make some static variables global

We will use them later in hugetlb_cgroup.c

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Cc: David Rientjes <rientjes@google.com>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Hillf Danton <dhillf@gmail.com>
Reviewed-by: Michal Hocko <mhocko@suse.cz>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index ed550d8..3d677dd 100644 (file)
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -21,6 +21,11 @@ struct hugepage_subpool {
        long max_hpages, used_hpages;
 };
 
        long max_hpages, used_hpages;
 };
 

+extern spinlock_t hugetlb_lock;
+extern int hugetlb_max_hstate __read_mostly;
+#define for_each_hstate(h) \
+       for ((h) = hstates; (h) < &hstates[hugetlb_max_hstate]; (h)++)
+

 struct hugepage_subpool *hugepage_new_subpool(long nr_blocks);
 void hugepage_put_subpool(struct hugepage_subpool *spool);
 
 struct hugepage_subpool *hugepage_new_subpool(long nr_blocks);
 void hugepage_put_subpool(struct hugepage_subpool *spool);
 

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index b5b6e15..d597159 100644 (file)
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -35,7 +35,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 gfp_t htlb_alloc_mask = GFP_HIGHUSER;
 unsigned long hugepages_treat_as_movable;
 

-static int hugetlb_max_hstate;
+int hugetlb_max_hstate __read_mostly;

 unsigned int default_hstate_idx;
 struct hstate hstates[HUGE_MAX_HSTATE];
 
 unsigned int default_hstate_idx;
 struct hstate hstates[HUGE_MAX_HSTATE];
 


@@ -46,13 +46,10 @@ static struct hstate * __initdata parsed_hstate;
 static unsigned long __initdata default_hstate_max_huge_pages;
 static unsigned long __initdata default_hstate_size;
 
 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[hugetlb_max_hstate]; (h)++)
-

 /*
  * Protects updates to hugepage_freelists, nr_huge_pages, and free_huge_pages
  */
 /*
  * Protects updates to hugepage_freelists, nr_huge_pages, and free_huge_pages
  */

-static DEFINE_SPINLOCK(hugetlb_lock);
+DEFINE_SPINLOCK(hugetlb_lock);

 
 static inline void unlock_or_release_subpool(struct hugepage_subpool *spool)
 {
 
 static inline void unlock_or_release_subpool(struct hugepage_subpool *spool)
 {