Changeset 46c20c8 in mainline for kernel/arch/amd64/src/amd64.c

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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) (5 diffs)

kernel/arch/amd64/src/amd64.c

@@ -35 +35 @@
 #include <arch.h>
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #include <config.h>
@@ -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();
@@ -228 +228 @@
             (uintptr_t) I8042_BASE);
 #endif
+        
+        /*
+         * This nasty hack should also go away ASAP.
+         */
+        trap_virtual_enable_irqs(1 << IRQ_DP8390);
+        sysinfo_set_item_val("netif.dp8390.inr", NULL, IRQ_DP8390);
 }
 
@@ -254 +260 @@
         THREAD->arch.tls = addr;
         write_msr(AMD_MSR_FS, addr);
+        
         return 0;
 }