From: Ali Saidi Date: Sat, 9 Dec 2006 23:27:54 +0000 (-0500) Subject: fix lisa's hand merge X-Git-Tag: m5_2.0_beta3~285 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4947bf276eaa19d33c1af0bd0843dc23192fdd19;p=gem5.git fix lisa's hand merge --HG-- extra : convert_revision : d25604156ae0b2cf29d92fb960b8f5d77427985b --- diff --git a/src/arch/sparc/ua2005.cc b/src/arch/sparc/ua2005.cc index c9aee9078..0db5f6acc 100644 --- a/src/arch/sparc/ua2005.cc +++ b/src/arch/sparc/ua2005.cc @@ -127,7 +127,7 @@ MiscRegFile::setFSRegWithEffect(int miscReg, const MiscReg &val, case MISCREG_HPSTATE: // T1000 spec says impl. dependent val must always be 1 setReg(miscReg, val | id); - + break; case MISCREG_HTSTATE: case MISCREG_STRAND_STS_REG: setReg(miscReg, val);