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

Timestamp:

2010-12-25T15:13:07Z (13 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/sparc64/src/sun4u/sparc64.c (modified) (2 diffs)

kernel/arch/sparc64/src/sun4u/sparc64.c

@@ -50 +50 @@
 #include <ddi/irq.h>
 #include <str.h>
+#include <sysinfo/sysinfo.h>
 
 memmap_t memmap;
@@ -111 +112 @@
 void arch_post_smp_init(void)
 {
+        /* Currently the only supported platform for sparc64/sun4u is 'sun4u'. */
+        static const char *platform = "sun4u";
+
+        sysinfo_set_item_data("platform", NULL, (void *) platform,
+            str_size(platform));
+
         standalone_sparc64_console_init();
 }