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

Timestamp:

2011-02-09T11:46:47Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cb15135a

Parents:

a49c4002 (diff), 0b37882 (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

Local modifications:

• change pipefs and ext2 to build again (use async_* calls instead of ipc_*)

File:

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

kernel/arch/amd64/src/amd64.c

@@ -199 +199 @@
 void arch_post_smp_init(void)
 {
+        /* Currently the only supported platform for amd64 is 'pc'. */
+        static const char *platform = "pc";
+
+        sysinfo_set_item_data("platform", NULL, (void *) platform,
+            str_size(platform));
+
 #ifdef CONFIG_PC_KBD
         /*
@@ -229 +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);
 }
 
@@ -256 +261 @@
  * we need not to go to CPL0 to read it.
  */
-unative_t sys_tls_set(unative_t addr)
+sysarg_t sys_tls_set(sysarg_t addr)
 {
         THREAD->arch.tls = addr;