Changeset 59ecd4a3 in mainline for kernel

Timestamp:

2010-04-04T21:41:47Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5db9084

Parents:

36a75a2 (diff), ee7e82a9 (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.

Location:

kernel/arch

Files:

• amd64/src/amd64.c (modified) (1 diff)
• ia32/src/ia32.c (modified) (1 diff)
• ia64/src/ia64.c (modified) (1 diff)
• sparc64/src/smp/sun4v/smp.c (modified) (1 diff)

kernel/arch/amd64/src/amd64.c

@@ -228 +228 @@
             (uintptr_t) I8042_BASE);
 #endif
-
-#ifdef CONFIG_NETIF_DP8390
+        
+        /*
+         * 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);
-#endif
 }
 

kernel/arch/ia32/src/ia32.c

@@ -186 +186 @@
             (uintptr_t) I8042_BASE);
 #endif
-
-#ifdef CONFIG_NETIF_DP8390
+        
+        /*
+         * 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);
-#endif
 }
 

kernel/arch/ia64/src/ia64.c

@@ -213 +213 @@
 #endif
 
-#ifdef CONFIG_NETIF_DP8390
         sysinfo_set_item_val("netif.dp8390.inr", NULL, IRQ_DP8390);
-#endif
 
         sysinfo_set_item_val("ia64_iospace", NULL, true);

kernel/arch/sparc64/src/smp/sun4v/smp.c

@@ -54 +54 @@
 #include <arch/smp/sun4v/smp.h>
 #include <str.h>
+#include <errno.h>
 
 /** hypervisor code of the "running" state of the CPU */