From f83c3e8c5691c5eb4af5e804515cc67f801be3d7 Mon Sep 17 00:00:00 2001 From: David Gibson Date: Thu, 16 Sep 2004 21:59:04 -0700 Subject: [PATCH] [PATCH] ppc64: remove LARGE_PAGE_SHIFT constant For historical reasons, ppc64 has ended up with two #defines for the size of a large (16M) page: LARGE_PAGE_SHIFT and HPAGE_SHIFT. This patch removes LARGE_PAGE_SHIFT in favour of the more widely used HPAGE_SHIFT. Signed-off-by: David Gibson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- arch/ppc64/kernel/pSeries_htab.c | 2 +- arch/ppc64/mm/hash_utils.c | 4 ++-- arch/ppc64/mm/hugetlbpage.c | 2 +- include/asm-ppc64/mmu.h | 2 -- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/arch/ppc64/kernel/pSeries_htab.c b/arch/ppc64/kernel/pSeries_htab.c index 95287d408175b..a6d112bd2cf07 100644 --- a/arch/ppc64/kernel/pSeries_htab.c +++ b/arch/ppc64/kernel/pSeries_htab.c @@ -329,7 +329,7 @@ static void pSeries_flush_hash_range(unsigned long context, va = (vsid << 28) | (batch->addr[i] & 0x0fffffff); batch->vaddr[j] = va; if (large) - vpn = va >> LARGE_PAGE_SHIFT; + vpn = va >> HPAGE_SHIFT; else vpn = va >> PAGE_SHIFT; hash = hpt_hash(vpn, large); diff --git a/arch/ppc64/mm/hash_utils.c b/arch/ppc64/mm/hash_utils.c index cf2fe76430eec..5dd8d71a527ea 100644 --- a/arch/ppc64/mm/hash_utils.c +++ b/arch/ppc64/mm/hash_utils.c @@ -100,7 +100,7 @@ static inline void create_pte_mapping(unsigned long start, unsigned long end, int ret; if (large) - vpn = va >> LARGE_PAGE_SHIFT; + vpn = va >> HPAGE_SHIFT; else vpn = va >> PAGE_SHIFT; @@ -332,7 +332,7 @@ void flush_hash_page(unsigned long context, unsigned long ea, pte_t pte, va = (vsid << 28) | (ea & 0x0fffffff); if (large) - vpn = va >> LARGE_PAGE_SHIFT; + vpn = va >> HPAGE_SHIFT; else vpn = va >> PAGE_SHIFT; hash = hpt_hash(vpn, large); diff --git a/arch/ppc64/mm/hugetlbpage.c b/arch/ppc64/mm/hugetlbpage.c index f52f757d22318..f9d47ac8f6d56 100644 --- a/arch/ppc64/mm/hugetlbpage.c +++ b/arch/ppc64/mm/hugetlbpage.c @@ -853,7 +853,7 @@ static void flush_hash_hugepage(mm_context_t context, unsigned long ea, vsid = get_vsid(context.id, ea); va = (vsid << 28) | (ea & 0x0fffffff); - vpn = va >> LARGE_PAGE_SHIFT; + vpn = va >> HPAGE_SHIFT; hash = hpt_hash(vpn, 1); if (hugepte_val(pte) & _HUGEPAGE_SECONDARY) hash = ~hash; diff --git a/include/asm-ppc64/mmu.h b/include/asm-ppc64/mmu.h index be30c8d8befd6..11d611742f205 100644 --- a/include/asm-ppc64/mmu.h +++ b/include/asm-ppc64/mmu.h @@ -107,8 +107,6 @@ typedef struct { extern HTAB htab_data; -#define LARGE_PAGE_SHIFT 24 - static inline unsigned long hpt_hash(unsigned long vpn, int large) { unsigned long vsid; -- 2.53.0