Changeset b0f00a9 in mainline for kernel/arch/ia64/src/ia64.c

Timestamp:

2011-11-06T22:21:05Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

898e847

Parents:

2bdf8313 (diff), 7b5f4c9 (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) (3 diffs)

kernel/arch/ia64/src/ia64.c

@@ -50 +50 @@
 #include <userspace.h>
 #include <console/console.h>
-#include <proc/uarg.h>
+#include <abi/proc/uarg.h>
 #include <syscall/syscall.h>
 #include <ddi/irq.h>
@@ -93 +93 @@
 void arch_pre_mm_init(void)
 {
-        /*
-         * Set Interruption Vector Address (i.e. location of interruption vector
-         * table).
-         */
-        iva_write((uintptr_t) &ivt);
-        srlz_d();
-        
 }
 
@@ -151 +144 @@
         /* Set platform name. */
 #ifdef MACHINE_ski
-        platform = "pc";
+        platform = "ski";
 #endif
 #ifdef MACHINE_i460GX