Fixed bug where system would lock if a user task segfaulted (forgot to sti)

[tpg/acess2.git] / Kernel / arch / x86 / include / arch.h

diff --git a/Kernel/arch/x86/include/arch.h b/Kernel/arch/x86/include/arch.h
index 0611c6c..6a7ab45 100644 (file)
--- a/Kernel/arch/x86/include/arch.h
+++ b/Kernel/arch/x86/include/arch.h
@@ -9,7 +9,7 @@
 // - Memory Layout
 #define        MM_USER_MIN     0x00200000
 #define        USER_STACK_SZ   0x00010000
-#define        USER_STACK_TOP  0x00200000
+#define        USER_STACK_TOP  0x00800000
 #define        MM_USER_MAX     0xBC000000
 #define        MM_PPD_MIN      0xBC000000      // Per-Process Data
 #define        MM_PPD_VFS      0xBC000000      // 
@@ -38,6 +38,12 @@
 # error "Unknown architecture '" #ARCH "'"
 #endif
 
+#if USE_MP
+# define       MAX_CPUS        8
+#else
+# define       MAX_CPUS        1
+#endif
+
 // === MACROS ===
 #define LOCK(lockptr)  do {int v=1;\
        while(v)__asm__ __volatile__("lock xchgl %%eax, (%%edi)":"=a"(v):"a"(1),"D"(lockptr));}while(0)