Changeset b2d06fa in mainline for kernel/arch/mips32/src/mips32.c

Timestamp:

2010-12-25T17:14:36Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

092e4f1

Parents:

59e9398b (diff), 3ac66f69 (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/mips32/src/mips32.c (modified) (1 diff)

kernel/arch/mips32/src/mips32.c

@@ -168 +168 @@
 void arch_post_smp_init(void)
 {
+        static const char *platform;
+
+        /* Set platform name. */
+#ifdef MACHINE_msim
+        platform = "msim";
+#endif
+#ifdef MACHINE_bgxemul
+        platform = "gxemul";
+#endif
+#ifdef MACHINE_lgxemul
+        platform = "gxemul";
+#endif
+        sysinfo_set_item_data("platform", NULL, (void *) platform,
+            str_size(platform));
+
 #ifdef CONFIG_MIPS_KBD
         /*