Changeset 973ef9fc in mainline for kernel/arch/ia32/src/ia32.c

Timestamp:

2010-12-25T21:20:28Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

631ee0c

Parents:

1bfd3d3 (diff), 09178b7f (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/ia32/src/ia32.c (modified) (2 diffs)

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
         /*
@@ -211 +217 @@
  * selector, and the descriptor->base is the correct address.
  */
-unative_t sys_tls_set(unative_t addr)
+sysarg_t sys_tls_set(sysarg_t addr)
 {
         THREAD->arch.tls = addr;