Changeset 32573ff in mainline for kernel/arch/amd64/src/amd64.c

Timestamp:

2016-05-02T20:58:16Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7c4b26c

Parents:

6adb775f (diff), 5035ba05 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline, which has dltest and fixes.

File:

• kernel/arch/amd64/src/amd64.c (modified) (3 diffs)

kernel/arch/amd64/src/amd64.c

@@ -56 +56 @@
 #include <genarch/multiboot/multiboot.h>
 #include <genarch/multiboot/multiboot2.h>
+#include <arch/pm.h>
+#include <arch/vreg.h>
+#include <arch/kseg.h>
 
 #ifdef CONFIG_SMP
@@ -139 +142 @@
 void arch_post_mm_init(void)
 {
+        vreg_init();
+        kseg_init();
+
         if (config.cpu_active == 1) {
                 /* Initialize IRQ routing */
@@ -262 +268 @@
 }
 
-/** Set thread-local-storage pointer
- *
- * TLS pointer is set in FS register. Unfortunately the 64-bit
- * part can be set only in CPL0 mode.
- *
- * The specs say, that on %fs:0 there is stored contents of %fs register,
- * we need not to go to CPL0 to read it.
- */
-sysarg_t sys_tls_set(uintptr_t addr)
-{
-        THREAD->arch.tls = addr;
-        write_msr(AMD_MSR_FS, addr);
-        
-        return EOK;
-}
-
 /** Construct function pointer
  *