Changeset 467bf40 in mainline for kernel/arch/ia32/src/ia32.c

Timestamp:

2010-12-25T15:13:07Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a465a56, e84d65a

Parents:

ab49a0d (diff), 6eb794a (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

Conflicts: no problem resolving.

File:

• kernel/arch/ia32/src/ia32.c (modified) (1 diff)

kernel/arch/ia32/src/ia32.c

@@ -157 +157 @@
 void arch_post_smp_init(void)
 {
+        /* Currently the only supported platform for ia32 is 'pc'. */
+        static const char *platform = "pc";
+
+        sysinfo_set_item_data("platform", NULL, (void *) platform,
+            str_size(platform));
+
 #ifdef CONFIG_PC_KBD
         /*