From ede260379297039b4f88bd5027fb7030ddf341a0 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Sun, 27 May 2007 20:24:47 -0700 Subject: [PATCH] --- yaml --- r: 57078 b: refs/heads/master c: 679292993c77c06f7ade4e317c13256b92c2651b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/sparc64/kernel/itlb_miss.S | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e6c963d3fccb..370321113bb6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b00ccd0f0b3fe8776aead63ec96313e84451b337 +refs/heads/master: 679292993c77c06f7ade4e317c13256b92c2651b diff --git a/trunk/arch/sparc64/kernel/itlb_miss.S b/trunk/arch/sparc64/kernel/itlb_miss.S index ad46e2024f4b..5a8377b54955 100644 --- a/trunk/arch/sparc64/kernel/itlb_miss.S +++ b/trunk/arch/sparc64/kernel/itlb_miss.S @@ -11,12 +11,12 @@ /* ITLB ** ICACHE line 2: TSB compare and TLB load */ bne,pn %xcc, tsb_miss_itlb ! Miss mov FAULT_CODE_ITLB, %g3 - andcc %g5, _PAGE_EXEC_4U, %g0 ! Executable? + sethi %hi(_PAGE_EXEC_4U), %g4 + andcc %g5, %g4, %g0 ! Executable? be,pn %xcc, tsb_do_fault nop ! Delay slot, fill me stxa %g5, [%g0] ASI_ITLB_DATA_IN ! Load TLB retry ! Trap done - nop /* ITLB ** ICACHE line 3: */ nop