Changeset cefb126 in mainline for kernel/arch/amd64/src/amd64.c

Timestamp:

2010-07-02T14:19:30Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

89c57b6

Parents:

fe7abd0 (diff), e3ee9b9 (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 changes.

File:

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

kernel/arch/amd64/src/amd64.c

@@ -122 +122 @@
         /* Enable FPU */
         cpu_setup_fpu();
-
+        
         /* Initialize segmentation */
         pm_init();
@@ -132 +132 @@
         /* Disable alignment check */
         clean_AM_flag();
-
+        
         if (config.cpu_active == 1) {
                 interrupt_init();
@@ -260 +260 @@
         THREAD->arch.tls = addr;
         write_msr(AMD_MSR_FS, addr);
+        
         return 0;
 }