Changeset b2d06fa in mainline for kernel/arch/sparc64/src/sun4v/sparc64.c

Timestamp:

2010-12-25T17:14:36Z (13 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/sparc64/src/sun4v/sparc64.c (modified) (2 diffs)

kernel/arch/sparc64/src/sun4v/sparc64.c

@@ -52 +52 @@
 #include <str.h>
 #include <arch/drivers/niagara.h>
+#include <sysinfo/sysinfo.h>
 
 memmap_t memmap;
@@ -109 +110 @@
 void arch_post_smp_init(void)
 {
+        /* Currently the only supported platform for sparc64/sun4v is 'sun4v'. */
+        static const char *platform = "sun4v";
+
+        sysinfo_set_item_data("platform", NULL, (void *) platform,
+            str_size(platform));
+
         niagarain_init();
 }