diff --git a/VersionASM b/VersionASM index 432c4d7de988b693d532ed8ea22a0aaf8cdccf4d..173335531d8c9c091514565eef20811eb31d8c67 100644 --- a/VersionASM +++ b/VersionASM @@ -13,11 +13,11 @@ GBLS Module_ComponentPath Module_MajorVersion SETS "6.08" Module_Version SETA 608 -Module_MinorVersion SETS "4.129.2.9" +Module_MinorVersion SETS "4.129.2.10" Module_Date SETS "07 Jul 2018" Module_ApplicationDate SETS "07-Jul-18" Module_ComponentName SETS "Kernel" Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel" -Module_FullVersion SETS "6.08 (4.129.2.9)" -Module_HelpVersion SETS "6.08 (07 Jul 2018) 4.129.2.9" +Module_FullVersion SETS "6.08 (4.129.2.10)" +Module_HelpVersion SETS "6.08 (07 Jul 2018) 4.129.2.10" END diff --git a/VersionNum b/VersionNum index c6a109fda0010d96e433114bebe9ec77426f39be..25c641cb5d8f7b03777f78f4791e6e1acbfed4c9 100644 --- a/VersionNum +++ b/VersionNum @@ -5,12 +5,12 @@ * */ #define Module_MajorVersion_CMHG 6.08 -#define Module_MinorVersion_CMHG 4.129.2.9 +#define Module_MinorVersion_CMHG 4.129.2.10 #define Module_Date_CMHG 07 Jul 2018 #define Module_MajorVersion "6.08" #define Module_Version 608 -#define Module_MinorVersion "4.129.2.9" +#define Module_MinorVersion "4.129.2.10" #define Module_Date "07 Jul 2018" #define Module_ApplicationDate "07-Jul-18" @@ -18,6 +18,6 @@ #define Module_ComponentName "Kernel" #define Module_ComponentPath "castle/RiscOS/Sources/Kernel" -#define Module_FullVersion "6.08 (4.129.2.9)" -#define Module_HelpVersion "6.08 (07 Jul 2018) 4.129.2.9" +#define Module_FullVersion "6.08 (4.129.2.10)" +#define Module_HelpVersion "6.08 (07 Jul 2018) 4.129.2.10" #define Module_LibraryVersionInfo "6:8" diff --git a/hdr/Options b/hdr/Options index 08dbc8317869f703a41d112ed52371aa9b764329..c54131984e6f7886d3c4b7181363cb9e186e6cd6 100644 --- a/hdr/Options +++ b/hdr/Options @@ -186,8 +186,10 @@ CacheablePageTables SETL {TRUE} ; Use cacheable page tables wher GBLL SyncPageTables SyncPageTables SETL (MEMM_Type = "VMSAv6") :LOR: CacheablePageTables ; Any page table modification (specifically, overwriting faulting entries) requires synchronisation + [ :LNOT: :DEF: SMP GBLL SMP SMP SETL (MEMM_Type = "VMSAv6") :LAND: {TRUE} ; Enable SMP-related changes + ] GBLL UseNewFX0Error UseNewFX0Error SETL ((Version :AND: 1) = 1) ; Whether *FX 0 should show the ROM link date instead of the UtilityModule date