Changeset 357b5f5 in mainline for boot/arch/ia64/include/types.h

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:

• boot/arch/ia64/include/types.h (modified) (2 diffs)

boot/arch/ia64/include/types.h

@@ -35 +35 @@
 
 typedef uint64_t size_t;
-typedef uint64_t unative_t;
+typedef uint64_t sysarg_t;
 typedef uint64_t uintptr_t;
 
@@ -61 +61 @@
         unsigned int memmap_items;
 
-        unative_t *sapic;
+        sysarg_t *sapic;
         unsigned long sys_freq;
         unsigned long freq_scale;