From linux-kernel@vger.kernel.org Thu Dec 18 21:43:15 2003 Date: Mon, 15 Dec 2003 04:44:43 +0000 From: Linux Kernel Mailing List To: bk-commits-24@vger.kernel.org Subject: [PPC64] Fix save_flags/restore_flags on iSeries. ChangeSet 1.1270.3.9, 2003/12/15 15:44:43+11:00, engebret@us.ibm.com [PPC64] Fix save_flags/restore_flags on iSeries. # This patch includes the following deltas: # ChangeSet 1.1270.3.8 -> 1.1270.3.9 # arch/ppc64/kernel/misc.S 1.8 -> 1.9 # misc.S | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff -Nru a/arch/ppc64/kernel/misc.S b/arch/ppc64/kernel/misc.S --- a/arch/ppc64/kernel/misc.S Mon Dec 15 07:03:59 2003 +++ b/arch/ppc64/kernel/misc.S Mon Dec 15 07:03:59 2003 @@ -69,16 +69,14 @@ _GLOBAL(__no_use_save_flags) mfspr r4,SPRG3 lbz r3,PACAPROCENABLED(r4) + /* shift into position of MSR.EE */ + sldi r3,r3,15 blr -/* void __no_use_restore_flags(unsigned long flags) */ +/* void __no_use_restore_flags(unsigned long flags) */ _GLOBAL(__no_use_restore_flags) -/* - * Just set/clear the MSR_EE bit through restore/flags but do not - * change anything else. This is needed by the RT system and makes - * sense anyway. - * -- Cort - */ + /* shift from position of MSR.EE */ + srdi r3,r3,15 mfspr r6,SPRG3 lbz r5,PACAPROCENABLED(r6) /* Check if things are setup the way we want _already_. */ @@ -104,6 +102,8 @@ lbz r3,PACAPROCENABLED(r5) li r4,0 stb r4,PACAPROCENABLED(r5) + /* shift into position of MSR.EE */ + sldi r3,r3,15 blr /* Done */ _GLOBAL(__no_use_sti) - To unsubscribe from this list: send the line "unsubscribe bk-commits-24" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html