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

Timestamp:

2010-12-17T10:14:01Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

6e5dc07

Parents:

9223dc5c (diff), 11658b64 (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 with usb/development

File:

• kernel/arch/ia64/src/ia64.c (modified) (3 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;
         
@@ -251 +251 @@
  * 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 +274 @@
 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;