This allows 32on64 to work again. Also, it's a clearer indication of a
missing part.
---
x86_64/locore.S | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/x86_64/locore.S b/x86_64/locore.S
index 806762bb..8f39a677 100644
--- a/x86_64/locore.S
+++ b/x86_64/locore.S
@@ -163,17 +163,21 @@
#define POP_SEGMENTS_ISR(reg)
#endif
+#if NCPUS > 1
+#define SET_KERNEL_SEGMENTS(reg) \
+ ud2 /* TODO: use swapgs or similar */
+#else // NCPUS > 1
#ifdef USER32
#define SET_KERNEL_SEGMENTS(reg) \
mov %ss,reg /* switch to kernel segments */ ;\
mov reg,%ds /* (same as kernel stack segment) */ ;\
mov reg,%es ;\
mov reg,%fs ;\
- mov $(PERCPU_DS),reg ;\
mov reg,%gs
-#else
+#else // USER32
#define SET_KERNEL_SEGMENTS(reg)
-#endif
+#endif // USER32
+#endif // NCPUS > 1
/*
* Fault recovery.
--
2.39.2
