Changeset ad7a6c9 in mainline for kernel/arch/ia64/src/ia64.c

Timestamp:

2011-03-30T13:10:24Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

4ae90f9

Parents:

6e50466 (diff), d6b81941 (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/ia64/src/ia64.c (modified) (2 diffs)

kernel/arch/ia64/src/ia64.c

@@ -147 +147 @@
 void arch_post_smp_init(void)
 {
+        static const char *platform;
+
+        /* Set platform name. */
+#ifdef MACHINE_ski
+        platform = "pc";
+#endif
+#ifdef MACHINE_i460GX
+        platform = "i460GX";
+#endif
+        sysinfo_set_item_data("platform", NULL, (void *) platform,
+            str_size(platform));
+
 #ifdef MACHINE_ski
         ski_instance_t *ski_instance = skiin_init();
@@ -210 +222 @@
 #endif
 
-        sysinfo_set_item_val("netif.dp8390.inr", NULL, IRQ_DP8390);
+        sysinfo_set_item_val("netif.ne2000.inr", NULL, IRQ_NE2000);
 
         sysinfo_set_item_val("ia64_iospace", NULL, true);