Commit 9c59105e authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] ppc64: yet another hugepage cleanup

From: David Gibson <david@gibson.dropbear.id.au>

Trivial cleanup to flush_hash_hugepage() in the ppc64 hugepage code.
parent fbdae6e4
...@@ -738,7 +738,7 @@ int hash_huge_page(struct mm_struct *mm, unsigned long access, ...@@ -738,7 +738,7 @@ int hash_huge_page(struct mm_struct *mm, unsigned long access,
static void flush_hash_hugepage(mm_context_t context, unsigned long ea, static void flush_hash_hugepage(mm_context_t context, unsigned long ea,
hugepte_t pte, int local) hugepte_t pte, int local)
{ {
unsigned long vsid, vpn, va, hash, secondary, slot; unsigned long vsid, vpn, va, hash, slot;
BUG_ON(hugepte_bad(pte)); BUG_ON(hugepte_bad(pte));
BUG_ON(!in_hugepage_area(context, ea)); BUG_ON(!in_hugepage_area(context, ea));
...@@ -748,8 +748,7 @@ static void flush_hash_hugepage(mm_context_t context, unsigned long ea, ...@@ -748,8 +748,7 @@ static void flush_hash_hugepage(mm_context_t context, unsigned long ea,
va = (vsid << 28) | (ea & 0x0fffffff); va = (vsid << 28) | (ea & 0x0fffffff);
vpn = va >> LARGE_PAGE_SHIFT; vpn = va >> LARGE_PAGE_SHIFT;
hash = hpt_hash(vpn, 1); hash = hpt_hash(vpn, 1);
secondary = !!(hugepte_val(pte) & _HUGEPAGE_SECONDARY); if (hugepte_val(pte) & _HUGEPAGE_SECONDARY)
if (secondary)
hash = ~hash; hash = ~hash;
slot = (hash & htab_data.htab_hash_mask) * HPTES_PER_GROUP; slot = (hash & htab_data.htab_hash_mask) * HPTES_PER_GROUP;
slot += (hugepte_val(pte) & _HUGEPAGE_GROUP_IX) >> 5; slot += (hugepte_val(pte) & _HUGEPAGE_GROUP_IX) >> 5;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment