LinuxPPC-Dev Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Ishizaki Kou <kou.ishizaki@toshiba.co.jp>
To: linuxppc-dev@ozlabs.org
Subject: [PATCH 15/16] TLB insersion for Celleb
Date: Wed, 15 Nov 2006 19:00:14 +0900 (JST)	[thread overview]
Message-ID: <200611151000.kAFA0Fxs012318@toshiba.co.jp> (raw)

This patch changes handling return value of ppc_md.hpte_insert() to 
the same way as __hash_page_*().

Signed-off-by: Kou Ishizaki <kou.ishizaki@toshiba.co.jp>
---

Index: linux-2.6.19/arch/powerpc/mm/hugetlbpage.c
diff -u linux-2.6.19/arch/powerpc/mm/hugetlbpage.c:1.1.1.1 linux-2.6.19/arch/powerpc/mm/hugetlbpage.c:1.2
--- linux-2.6.19/arch/powerpc/mm/hugetlbpage.c:1.1.1.1	Fri Oct  6 10:40:06 2006
+++ linux-2.6.19/arch/powerpc/mm/hugetlbpage.c	Wed Oct 11 20:45:10 2006
@@ -1008,7 +1008,6 @@
 
 		/* Primary is full, try the secondary */
 		if (unlikely(slot == -1)) {
-			new_pte |= _PAGE_F_SECOND;
 			hpte_group = ((~hash & htab_hash_mask) *
 				      HPTES_PER_GROUP) & ~0x7UL; 
 			slot = ppc_md.hpte_insert(hpte_group, va, pa, rflags,
@@ -1027,7 +1026,7 @@
 		if (unlikely(slot == -2))
 			panic("hash_huge_page: pte_insert failed\n");
 
-		new_pte |= (slot << 12) & _PAGE_F_GIX;
+		new_pte |= (slot << 12) & (_PAGE_F_SECOND | _PAGE_F_GIX);
 	}
 
 	/*

             reply	other threads:[~2006-11-15 10:00 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-11-15 10:00 Ishizaki Kou [this message]
2006-11-15 23:57 ` [PATCH 15/16] TLB insersion for Celleb Benjamin Herrenschmidt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=200611151000.kAFA0Fxs012318@toshiba.co.jp \
    --to=kou.ishizaki@toshiba.co.jp \
    --cc=linuxppc-dev@ozlabs.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox