diff --git a/VersionASM b/VersionASM
index b50b17ddb68874d6e46f3d72f224d67d2d77470d..db2ec802a4da799604122c15e605337d3eeb46aa 100644
--- a/VersionASM
+++ b/VersionASM
@@ -13,11 +13,11 @@
GBLS Module_ComponentPath
Module_MajorVersion SETS "5.35"
Module_Version SETA 535
-Module_MinorVersion SETS "4.79.2.147.2.5"
-Module_Date SETS "20 May 2012"
-Module_ApplicationDate SETS "20-May-12"
+Module_MinorVersion SETS "4.79.2.147.2.6"
+Module_Date SETS "21 May 2012"
+Module_ApplicationDate SETS "21-May-12"
Module_ComponentName SETS "Kernel"
Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel"
-Module_FullVersion SETS "5.35 (4.79.2.147.2.5)"
-Module_HelpVersion SETS "5.35 (20 May 2012) 4.79.2.147.2.5"
+Module_FullVersion SETS "5.35 (4.79.2.147.2.6)"
+Module_HelpVersion SETS "5.35 (21 May 2012) 4.79.2.147.2.6"
END
diff --git a/VersionNum b/VersionNum
index b6a1d1addb0417481e185243123016aabfc1738e..ca1f86076ac75d1e388162a52ad16c5ecab154a6 100644
--- a/VersionNum
+++ b/VersionNum
@@ -5,19 +5,19 @@
*
*/
#define Module_MajorVersion_CMHG 5.35
-#define Module_MinorVersion_CMHG 4.79.2.147.2.5
-#define Module_Date_CMHG 20 May 2012
+#define Module_MinorVersion_CMHG 4.79.2.147.2.6
+#define Module_Date_CMHG 21 May 2012
#define Module_MajorVersion "5.35"
#define Module_Version 535
-#define Module_MinorVersion "4.79.2.147.2.5"
-#define Module_Date "20 May 2012"
+#define Module_MinorVersion "4.79.2.147.2.6"
+#define Module_Date "21 May 2012"
-#define Module_ApplicationDate "20-May-12"
+#define Module_ApplicationDate "21-May-12"
#define Module_ComponentName "Kernel"
#define Module_ComponentPath "castle/RiscOS/Sources/Kernel"
-#define Module_FullVersion "5.35 (4.79.2.147.2.5)"
-#define Module_HelpVersion "5.35 (20 May 2012) 4.79.2.147.2.5"
+#define Module_FullVersion "5.35 (4.79.2.147.2.6)"
+#define Module_HelpVersion "5.35 (21 May 2012) 4.79.2.147.2.6"
#define Module_LibraryVersionInfo "5:35"
diff --git a/s/Kernel b/s/Kernel
index 13b877ed3fc38f746566b0e04df5207a5c8e1941..d923232cd86ba8634ef987e4b134f2c00103e35c 100644
--- a/s/Kernel
+++ b/s/Kernel
@@ -1498,11 +1498,11 @@ VecSwiDespatch ROUT
[ NoARMT2
AND r14, r14, #&F0000000 ; extract caller's CCs
BIC r11, r11, #&F0000000 ; mask out ours
- ORR r11, r11, #I32_bit ; disable IRQs (cf J Lee mod)
+ BIC r11, r11, #I32_bit ; enable IRQs
ORR r11, r11, r14 ; add in CCs
|
MOV r14, r14, LSR #28
- ORR r11, r11, #I32_bit ; disable IRQs (cf J Lee mod)
+ BIC r11, r11, #I32_bit ; enable IRQs
BFI r11, r14, #28, #4 ; add in caller's CCs
]
MSR CPSR_cf, r11 ; and set it all up