Changeset 208b5f5 in mainline for kernel/arch/sparc32/include/arch/asm.h

Timestamp:

2013-12-29T14:32:55Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4c14b88, 6fa9a99d, 9be30cdf, aacdb8e

Parents:

2a13328

Message:

cherrypick important fixes and updates from lp:~jceel/helenos/leon3

File:

• kernel/arch/sparc32/include/arch/asm.h (modified) (3 diffs)

kernel/arch/sparc32/include/arch/asm.h

@@ -161 +161 @@
         pil = psr.pil;
         
+        psr.pil = 0x00;
+        psr_write(psr.value);
+        
+        return pil;
+}
+
+NO_TRACE static inline ipl_t interrupts_disable(void)
+{
+        psr_reg_t psr;
+        psr.value = psr_read();
+        
+        ipl_t pil;
+        pil = psr.pil;
+        
         psr.pil = 0x0f;
         psr_write(psr.value);
@@ -167 +181 @@
 }
 
-NO_TRACE static inline ipl_t interrupts_disable(void)
-{
-        psr_reg_t psr;
-        psr.value = psr_read();
-        
-        ipl_t pil;
-        pil = psr.pil;
-        
-        psr.pil = 0;
-        psr_write(psr.value);
-        
-        return pil;
-}
-
 NO_TRACE static inline void interrupts_restore(ipl_t ipl)
 {
@@ -200 +200 @@
         psr_reg_t psr;
         psr.value = psr_read();
-        return psr.pil == 0;
+        return (psr.pil == 0x0f);
 }