From 05a572eb58b8d5f05032281c697edacca5ffec29 Mon Sep 17 00:00:00 2001
From: Kaspar Schleiser <kaspar@schleiser.de>
Date: Mon, 14 Dec 2015 21:34:15 +0100
Subject: [PATCH 1/3] cpu: x86: remove obsolete dINT/eINT

---
 cpu/x86/include/cpu.h   | 16 ----------------
 cpu/x86/x86_threading.c |  4 ++--
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/cpu/x86/include/cpu.h b/cpu/x86/include/cpu.h
index 8804e46a16..b6adf77ffe 100644
--- a/cpu/x86/include/cpu.h
+++ b/cpu/x86/include/cpu.h
@@ -50,22 +50,6 @@ extern "C" {
 #define ARCH_HAS_ATOMIC_COMPARE_AND_SWAP 1
 /** @} */
 
-/**
- * @brief Disable interrupts
- */
-static inline void __attribute__((always_inline)) dINT(void)
-{
-    asm volatile ("cli");
-}
-
-/**
- * @brief Enable interrupts
- */
-static inline void __attribute__((always_inline)) eINT(void)
-{
-    asm volatile ("sti");
-}
-
 /**
  * @brief   Disable interrupts and halt forever.
  *
diff --git a/cpu/x86/x86_threading.c b/cpu/x86/x86_threading.c
index da4c07a136..69d8a3485b 100644
--- a/cpu/x86/x86_threading.c
+++ b/cpu/x86/x86_threading.c
@@ -142,7 +142,7 @@ void isr_cpu_switch_context_exit(void)
 
 void cpu_switch_context_exit(void)
 {
-    dINT();
+    disableIRQ();
 
     if (!x86_in_isr) {
         x86_in_isr = true;
@@ -206,7 +206,7 @@ static void fpu_used_interrupt(uint8_t intr_num, struct x86_pushad *orig_ctx, un
 
 static void x86_thread_exit(void)
 {
-    dINT();
+    disableIRQ();
     if (fpu_owner == sched_active_pid) {
         fpu_owner = KERNEL_PID_UNDEF;
     }

From 64674d21d51fed6b58b6691edc9f4d88e46235b7 Mon Sep 17 00:00:00 2001
From: Kaspar Schleiser <kaspar@schleiser.de>
Date: Mon, 14 Dec 2015 21:34:35 +0100
Subject: [PATCH 2/3] core: irq.h: remove dINT/eINT traces

---
 core/include/irq.h | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/core/include/irq.h b/core/include/irq.h
index 75cc7453c8..facc04be07 100644
--- a/core/include/irq.h
+++ b/core/include/irq.h
@@ -31,8 +31,6 @@
 /**
  * @brief   This function sets the IRQ disable bit in the status register
  *
- * @note    This function should be used in favour of dINT().
- *
  * @return  Previous value of status register. The return value should not
  *          interpreted as a boolean value. The actual value is only
  *          significant for restoreIRQ().
@@ -44,8 +42,6 @@ unsigned disableIRQ(void);
 /**
  * @brief   This function clears the IRQ disable bit in the status register
  *
- * @note    This function should be used in favour of eINT().
- *
  * @return  Previous value of status register. The return value should not
  *          interpreted as a boolean value. The actual value is only
  *          significant for restoreIRQ().
@@ -60,8 +56,6 @@ unsigned enableIRQ(void);
  *
  * @param[in] state   state to restore
  *
- * @note    This function should be used in favour of eINT().
- *
  * @see     enableIRQ
  * @see     disableIRQ
  */

From 2d2bfbf7c95d3c7e730051923d523bb4d77d0246 Mon Sep 17 00:00:00 2001
From: Kaspar Schleiser <kaspar@schleiser.de>
Date: Mon, 14 Dec 2015 21:34:48 +0100
Subject: [PATCH 3/3] cpu: msp430: remove dINT/eINT

---
 cpu/msp430-common/include/cpu.h | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/cpu/msp430-common/include/cpu.h b/cpu/msp430-common/include/cpu.h
index 276dd57332..2c3c487f43 100644
--- a/cpu/msp430-common/include/cpu.h
+++ b/cpu/msp430-common/include/cpu.h
@@ -44,14 +44,6 @@ extern "C" {
  */
 #define ISR(a,b)        void __attribute__((naked, interrupt (a))) b(void)
 
-/**
- * @brief   Deprecated interrupt control functions for backward compatibility
- * @{
- */
-#define eINT            enableIRQ
-#define dINT            disableIRQ
-/** @} */
-
 /**
  * @brief Globally disable IRQs
  */