[rtems commit] arm: Fix ARM_CONTEXT_CONTROL_ISR_DISPATCH_DISABLE

[Sebastian Huber]

Module:    rtems
Branch:    master
Commit:    9f225dea192e7b17ba465a6b78029532cdf97933
Changeset: http://git.rtems.org/rtems/commit/?id=9f225dea192e7b17ba465a6b78029532cdf97933

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Mon Nov 21 10:11:18 2016 +0100

arm: Fix ARM_CONTEXT_CONTROL_ISR_DISPATCH_DISABLE

Close #2816.

---

 cpukit/score/cpu/arm/rtems/score/cpu.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/cpukit/score/cpu/arm/rtems/score/cpu.h b/cpukit/score/cpu/arm/rtems/score/cpu.h
index 6a57ac8..df30341 100644
--- a/cpukit/score/cpu/arm/rtems/score/cpu.h
+++ b/cpukit/score/cpu/arm/rtems/score/cpu.h
@@ -210,10 +210,12 @@
 #endif
 
 #ifdef ARM_MULTILIB_ARCH_V4
-  #ifdef ARM_MULTILIB_VFP
+  #if defined(ARM_MULTILIB_VFP)
     #define ARM_CONTEXT_CONTROL_ISR_DISPATCH_DISABLE 112
-  #else
+  #elif defined(ARM_MULTILIB_HAS_THREAD_ID_REGISTER)
     #define ARM_CONTEXT_CONTROL_ISR_DISPATCH_DISABLE 48
+  #else
+    #define ARM_CONTEXT_CONTROL_ISR_DISPATCH_DISABLE 44
   #endif
 #endif