Changeset 357b5f5 in mainline for kernel/arch/ia64/src/ia64.c

Timestamp:

2011-01-23T20:09:13Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fdb9982c

Parents:

cead2aa (diff), 7e36c8d (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/ia64/src/ia64.c (modified) (5 diffs)

kernel/arch/ia64/src/ia64.c

@@ -104 +104 @@
 static void iosapic_init(void)
 {
-        uint64_t IOSAPIC = PA2KA((unative_t)(iosapic_base)) | FW_OFFSET;
+        uint64_t IOSAPIC = PA2KA((sysarg_t)(iosapic_base)) | FW_OFFSET;
         int i;
         
@@ -147 +147 @@
 void arch_post_smp_init(void)
 {
+        static const char *platform;
+
+        /* Set platform name. */
+#ifdef MACHINE_ski
+        platform = "pc";
+#endif
+#ifdef MACHINE_i460GX
+        platform = "i460GX";
+#endif
+        sysinfo_set_item_data("platform", NULL, (void *) platform,
+            str_size(platform));
+
 #ifdef MACHINE_ski
         ski_instance_t *ski_instance = skiin_init();
@@ -210 +222 @@
 #endif
 
-        sysinfo_set_item_val("netif.dp8390.inr", NULL, IRQ_DP8390);
+        sysinfo_set_item_val("netif.ne2000.inr", NULL, IRQ_NE2000);
 
         sysinfo_set_item_val("ia64_iospace", NULL, true);
@@ -251 +263 @@
  * We use r13 (a.k.a. tp) for this purpose.
  */
-unative_t sys_tls_set(unative_t addr)
+sysarg_t sys_tls_set(sysarg_t addr)
 {
         return 0;
@@ -274 +286 @@
 void *arch_construct_function(fncptr_t *fptr, void *addr, void *caller)
 {
-        fptr->fnc = (unative_t) addr;
-        fptr->gp = ((unative_t *) caller)[1];
+        fptr->fnc = (sysarg_t) addr;
+        fptr->gp = ((sysarg_t *) caller)[1];
         
         return (void *) fptr;