Disable smp for now, as there are some issues with ipi synchronizatio…

…n which are being worked on in a branch
Meulengracht · Apr 23, 2019 · 623e020 · 623e020
1 parent 466ebac
commit 623e020
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 20 deletions.
diff --git a/config/common.mk b/config/common.mk
@@ -55,7 +55,7 @@ config_flags += -D__OSCONFIG_DEBUGMODE
 
 config_flags += -D__OSCONFIG_LOGGING_KTRACE # Kernel Tracing
 #config_flags += -D__OSCONFIG_DISABLE_SIGNALLING # Kernel fault on all hardware signals
-config_flags += -D__OSCONFIG_ENABLE_MULTIPROCESSORS # Use all cores
+#config_flags += -D__OSCONFIG_ENABLE_MULTIPROCESSORS # Use all cores
 
 #config_flags += -D__OSCONFIG_ENABLE_DEBUG_SHORTCUTS
 #config_flags += -D__OSCONFIG_RUN_CPPTESTS # Enables user-mode testing programs for the c/c++ suite.

diff --git a/kernel/arch/x86/components/smp_trampoline.c b/kernel/arch/x86/components/smp_trampoline.c
@@ -1,7 +1,7 @@
 /* Automatically generated file, do not change contents.
  * The below file data is from build/ap.sys. */
 
-const char __GlbTramplineCode[618] = {
+const char __GlbTramplineCode[677] = {
     0xe9, 0x09, 0x01, 0x9c, 0x1e, 0x06, 0x57, 0x56, 0xfa, 0x31, 0xc0, 
     0x8e, 0xc0, 0xf7, 0xd0, 0x8e, 0xd8, 0xbf, 0x00, 0x05, 0xbe, 0x10, 
     0x05, 0x26, 0x8a, 0x05, 0x50, 0x3e, 0x8a, 0x04, 0x50, 0x26, 0xc6, 
@@ -28,7 +28,7 @@ const char __GlbTramplineCode[618] = {
     0x00, 0xbe, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x03, 
     0x00, 0x00, 0x00, 0x00, 0xfa, 0xea, 0x12, 0x81, 0x00, 0x00, 0x31, 
     0xc0, 0x8e, 0xd8, 0x8e, 0xc0, 0x8e, 0xe0, 0x8e, 0xe8, 0x8e, 0xd0, 
-    0xa1, 0x5e, 0x82, 0xf0, 0x0f, 0xc1, 0x06, 0x60, 0x82, 0x89, 0xc4, 
+    0xa1, 0x99, 0x82, 0xf0, 0x0f, 0xc1, 0x06, 0x9b, 0x82, 0x89, 0xc4, 
     0x89, 0xc5, 0x31, 0xc0, 0xfb, 0xe8, 0x56, 0xff, 0xe8, 0x7e, 0xff, 
     0x0f, 0x20, 0xc0, 0x66, 0x83, 0xc8, 0x01, 0x0f, 0x22, 0xc0, 0xea, 
     0xfb, 0x81, 0x08, 0x00, 0x60, 0xb8, 0x01, 0x00, 0x00, 0x80, 0x0f, 
@@ -49,16 +49,21 @@ const char __GlbTramplineCode[618] = {
     0xc0, 0x0f, 0x32, 0x0d, 0x00, 0x01, 0x00, 0x00, 0x0f, 0x30, 0x0f, 
     0x20, 0xc0, 0x0d, 0x00, 0x00, 0x00, 0x80, 0x0f, 0x22, 0xc0, 0x61, 
     0xc3, 0xfa, 0x31, 0xc0, 0x66, 0xb8, 0x10, 0x00, 0x8e, 0xd8, 0x8e, 
-    0xe0, 0x8e, 0xe8, 0x8e, 0xd0, 0x8e, 0xc0, 0x0f, 0xb7, 0xe5, 0xa1, 
-    0x62, 0x82, 0x00, 0x00, 0x0f, 0x22, 0xd8, 0x0f, 0x20, 0xc0, 0x0d, 
-    0x00, 0x00, 0x00, 0x80, 0x0f, 0x22, 0xc0, 0x31, 0xf6, 0x31, 0xff, 
-    0x8b, 0x0d, 0x66, 0x82, 0x00, 0x00, 0xff, 0xe1, 0xfa, 0xf4, 0x31, 
-    0xc0, 0x66, 0xb8, 0x30, 0x00, 0x8e, 0xd8, 0x8e, 0xe0, 0x8e, 0xe8, 
-    0x8e, 0xd0, 0x8e, 0xc0, 0x48, 0x0f, 0xb7, 0xe5, 0x48, 0x31, 0xf6, 
-    0x48, 0x31, 0xff, 0x48, 0x31, 0xc0, 0x48, 0x31, 0xdb, 0x48, 0x31, 
-    0xc9, 0x8b, 0x0c, 0x25, 0x66, 0x82, 0x00, 0x00, 0xff, 0xe1, 0xfa, 
-    0xf4, 0x00, 0x05, 0x00, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00
+    0xe0, 0x8e, 0xe8, 0x8e, 0xd0, 0x8e, 0xc0, 0x0f, 0xb7, 0xe5, 0xe8, 
+    0x2f, 0xff, 0xff, 0xff, 0x83, 0xf8, 0x01, 0x75, 0x31, 0xa1, 0x9d, 
+    0x82, 0x00, 0x00, 0x0f, 0x22, 0xd8, 0x0f, 0x20, 0xe0, 0x83, 0xc8, 
+    0x20, 0x0f, 0x22, 0xe0, 0xb9, 0x80, 0x00, 0x00, 0xc0, 0x0f, 0x32, 
+    0x0d, 0x00, 0x01, 0x00, 0x00, 0x0f, 0x30, 0x0f, 0x20, 0xc0, 0x0d, 
+    0x00, 0x00, 0x00, 0x80, 0x0f, 0x22, 0xc0, 0xea, 0x6b, 0x82, 0x00, 
+    0x00, 0x28, 0x00, 0xa1, 0x9d, 0x82, 0x00, 0x00, 0x0f, 0x22, 0xd8, 
+    0x0f, 0x20, 0xc0, 0x0d, 0x00, 0x00, 0x00, 0x80, 0x0f, 0x22, 0xc0, 
+    0x31, 0xf6, 0x31, 0xff, 0x8b, 0x0d, 0xa1, 0x82, 0x00, 0x00, 0xff, 
+    0xe1, 0xfa, 0xf4, 0x31, 0xc0, 0x66, 0xb8, 0x30, 0x00, 0x8e, 0xd8, 
+    0x8e, 0xe0, 0x8e, 0xe8, 0x8e, 0xd0, 0x8e, 0xc0, 0x48, 0x0f, 0xb7, 
+    0xe5, 0x48, 0x31, 0xf6, 0x48, 0x31, 0xff, 0x48, 0x31, 0xc0, 0x48, 
+    0x31, 0xdb, 0x48, 0x31, 0xc9, 0x8b, 0x0c, 0x25, 0xa1, 0x82, 0x00, 
+    0x00, 0xff, 0xe1, 0xfa, 0xf4, 0x00, 0x05, 0x00, 0x15, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
 
-const int __GlbTramplineCode_length = 618;
+const int __GlbTramplineCode_length = 677;
diff --git a/kernel/include/revision.h b/kernel/include/revision.h
@@ -3,12 +3,12 @@
 #ifndef _REVISION_H_
 #define _REVISION_H_
 
-#define BUILD_DATE "18 April 2019"
-#define BUILD_TIME "15:38:52"
+#define BUILD_DATE "23 April 2019"
+#define BUILD_TIME "05:58:09"
 #define BUILD_SYSTEM "clang"
 
 #define REVISION_MAJOR 0
 #define REVISION_MINOR 5
-#define REVISION_BUILD 10932
+#define REVISION_BUILD 10933
 
 #endif //!_REVISION_H_
diff --git a/revision.h b/revision.h
@@ -3,12 +3,12 @@
 #ifndef _REVISION_H_
 #define _REVISION_H_
 
-#define BUILD_DATE "18 April 2019"
-#define BUILD_TIME "15:38:52"
+#define BUILD_DATE "23 April 2019"
+#define BUILD_TIME "05:58:09"
 #define BUILD_SYSTEM "clang"
 
 #define REVISION_MAJOR 0
 #define REVISION_MINOR 5
-#define REVISION_BUILD 10932
+#define REVISION_BUILD 10933
 
 #endif //!_REVISION_H_