Changes in kernel/arch/arm64/src/interrupt.c [6de65f3:84176f3] in mainline

File:

• kernel/arch/arm64/src/interrupt.c (modified) (4 diffs)

kernel/arch/arm64/src/interrupt.c

@@ -53 +53 @@
         DAIF_write(daif | DAIF_IRQ_FLAG);
 
-        return daif & DAIF_IRQ_FLAG;
+        return (daif >> DAIF_IRQ_SHIFT) & 1;
 }
 
@@ -66 +66 @@
         DAIF_write(daif & ~DAIF_IRQ_FLAG);
 
-        return daif & DAIF_IRQ_FLAG;
+        return (daif >> DAIF_IRQ_SHIFT) & 1;
 }
 
@@ -77 +77 @@
         uint64_t daif = DAIF_read();
 
-        DAIF_write((daif & ~DAIF_IRQ_FLAG) | (ipl & DAIF_IRQ_FLAG));
+        DAIF_write((daif & ~DAIF_IRQ_FLAG) |
+            ((ipl & 1) << DAIF_IRQ_SHIFT));
 }
 
@@ -86 +87 @@
 ipl_t interrupts_read(void)
 {
-        return DAIF_read() & DAIF_IRQ_FLAG;
+        return (DAIF_read() >> DAIF_IRQ_SHIFT) & 1;
 }