Merge branch 'merge' into next

[linux-2.6-omap-h63xx.git] / arch / powerpc / mm / hugetlbpage.c

diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
index f0c3b88d50fa5a5f98847bd1914be1881885af9d..201c7a5486cb3f815e89ec8e54966b5f29f6feb0 100644 (file)
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c
@@ -53,8 +53,7 @@ unsigned int mmu_huge_psizes[MMU_PAGE_COUNT] = { }; /* initialize all to 0 */
 
 /* Subtract one from array size because we don't need a cache for 4K since
  * is not a huge page size */
-#define huge_pgtable_cache(psize)      (pgtable_cache[HUGEPTE_CACHE_NUM \
-                                                       + psize-1])
+#define HUGE_PGTABLE_INDEX(psize)      (HUGEPTE_CACHE_NUM + psize - 1)
 #define HUGEPTE_CACHE_NAME(psize)      (huge_pgtable_cache_name[psize])
 
 static const char *huge_pgtable_cache_name[MMU_PAGE_COUNT] = {
@@ -113,7 +112,7 @@ static inline pte_t *hugepte_offset(hugepd_t *hpdp, unsigned long addr,
 static int __hugepte_alloc(struct mm_struct *mm, hugepd_t *hpdp,
                           unsigned long address, unsigned int psize)
 {
-       pte_t *new = kmem_cache_zalloc(huge_pgtable_cache(psize),
+       pte_t *new = kmem_cache_zalloc(pgtable_cache[HUGE_PGTABLE_INDEX(psize)],
                                      GFP_KERNEL|__GFP_REPEAT);
 
        if (! new)
@@ -121,7 +120,7 @@ static int __hugepte_alloc(struct mm_struct *mm, hugepd_t *hpdp,
 
        spin_lock(&mm->page_table_lock);
        if (!hugepd_none(*hpdp))
-               kmem_cache_free(huge_pgtable_cache(psize), new);
+               kmem_cache_free(pgtable_cache[HUGE_PGTABLE_INDEX(psize)], new);
        else
                hpdp->pd = (unsigned long)new | HUGEPD_OK;
        spin_unlock(&mm->page_table_lock);
@@ -763,13 +762,14 @@ static int __init hugetlbpage_init(void)
 
        for (psize = 0; psize < MMU_PAGE_COUNT; ++psize) {
                if (mmu_huge_psizes[psize]) {
-                       huge_pgtable_cache(psize) = kmem_cache_create(
-                                               HUGEPTE_CACHE_NAME(psize),
-                                               HUGEPTE_TABLE_SIZE(psize),
-                                               HUGEPTE_TABLE_SIZE(psize),
-                                               0,
-                                               NULL);
-                       if (!huge_pgtable_cache(psize))
+                       pgtable_cache[HUGE_PGTABLE_INDEX(psize)] =
+                               kmem_cache_create(
+                                       HUGEPTE_CACHE_NAME(psize),
+                                       HUGEPTE_TABLE_SIZE(psize),
+                                       HUGEPTE_TABLE_SIZE(psize),
+                                       0,
+                                       NULL);
+                       if (!pgtable_cache[HUGE_PGTABLE_INDEX(psize)])
                                panic("hugetlbpage_init(): could not create %s"\
                                      "\n", HUGEPTE_CACHE_NAME(psize));
                }