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

Timestamp:

2010-07-12T10:53:30Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bd11d3e

Parents:

c40e6ef (diff), bee2d4c (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;
 }