* [PATCH 15/16] TLB insersion for Celleb
@ 2006-11-15 10:00 Ishizaki Kou
2006-11-15 23:57 ` Benjamin Herrenschmidt
0 siblings, 1 reply; 2+ messages in thread
From: Ishizaki Kou @ 2006-11-15 10:00 UTC (permalink / raw)
To: linuxppc-dev
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);
}
/*
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH 15/16] TLB insersion for Celleb
2006-11-15 10:00 [PATCH 15/16] TLB insersion for Celleb Ishizaki Kou
@ 2006-11-15 23:57 ` Benjamin Herrenschmidt
0 siblings, 0 replies; 2+ messages in thread
From: Benjamin Herrenschmidt @ 2006-11-15 23:57 UTC (permalink / raw)
To: Ishizaki Kou; +Cc: linuxppc-dev
On Wed, 2006-11-15 at 19:00 +0900, Ishizaki Kou wrote:
> 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>
Acked-by: Benjamin Herrenschmidt <benh@kernel•crashing.org>
> ---
>
> 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);
> }
>
> /*
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@ozlabs•org
> https://ozlabs.org/mailman/listinfo/linuxppc-dev
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-11-15 23:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-11-15 10:00 [PATCH 15/16] TLB insersion for Celleb Ishizaki Kou
2006-11-15 23:57 ` Benjamin Herrenschmidt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox