Module Name: src Committed By: nakayama Date: Mon Nov 30 05:22:55 UTC 2009
Modified Files: src/sys/arch/sparc64/sparc64: locore.s Log Message: sp_tlb_flush_pte for cheetah: - restore interrupts properly in case of %tl > 0. To generate a diff of this commit: cvs rdiff -u -r1.298 -r1.299 src/sys/arch/sparc64/sparc64/locore.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/sparc64/sparc64/locore.s diff -u src/sys/arch/sparc64/sparc64/locore.s:1.298 src/sys/arch/sparc64/sparc64/locore.s:1.299 --- src/sys/arch/sparc64/sparc64/locore.s:1.298 Mon Nov 30 01:58:49 2009 +++ src/sys/arch/sparc64/sparc64/locore.s Mon Nov 30 05:22:55 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.298 2009/11/30 01:58:49 mrg Exp $ */ +/* $NetBSD: locore.s,v 1.299 2009/11/30 05:22:55 nakayama Exp $ */ /* * Copyright (c) 1996-2002 Eduardo Horvath @@ -5464,14 +5464,12 @@ #endif flush %o1 stxa %o5, [%o2] ASI_DMMU ! Restore primary context - brz,pt %o3, 1f + brnz,pt %o3, 1f flush %o1 - retl - nop + wrpr %g0, %o3, %tl ! Return to kernel mode. 1: - wrpr %o4, %pstate ! restore interrupts retl - wrpr %g0, %o3, %tl ! Return to kernel mode. + wrpr %o4, %pstate ! restore interrupts #endif