Changeset 80cd7cd in mainline for kernel/arch/amd64/src/amd64.c

Timestamp:

2011-01-13T20:58:24Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

87e373b

Parents:

eaef141 (diff), a613fea1 (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) (1 diff)

kernel/arch/amd64/src/amd64.c

@@ -235 +235 @@
 #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);
+        if (irqs_info != NULL)
+                sysinfo_set_item_val(irqs_info, NULL, true);
+        
+        sysinfo_set_item_val("netif.ne2000.inr", NULL, IRQ_NE2000);
 }