Changeset 810a36f in mainline for kernel/arch/ia64

Timestamp:

2017-10-24T05:29:08Z (8 years ago)

Author:

jzr <zarevucky.jiri@…>

Branches:

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

Children:

b1eb7ef

Parents:

c8fbbe7 (diff), 673ea28 (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 branch 'types'.

Location:

kernel/arch/ia64

Files:

• include/arch/types.h (modified) (2 diffs)
• src/interrupt.c (modified) (1 diff)

kernel/arch/ia64/include/arch/types.h

@@ -36 +36 @@
 #define KERN_ia64_TYPES_H_
 
-#include <arch/common.h>
-
-typedef uint64_t size_t;
-typedef int64_t ssize_t;
-
-typedef uint64_t uintptr_t;
-typedef uint64_t pfn_t;
-
-typedef uint64_t ipl_t;
-
-typedef uint64_t sysarg_t;
-typedef int64_t native_t;
-typedef uint64_t atomic_count_t;
+#include <_bits/all.h>
 
 typedef struct {
@@ -55 +43 @@
 } __attribute__((may_alias)) fncptr_t;
 
-#define PRIdn  PRId64  /**< Format for native_t. */
-#define PRIun  PRIu64  /**< Format for sysarg_t. */
-#define PRIxn  PRIx64  /**< Format for hexadecimal sysarg_t. */
-#define PRIua  PRIu64  /**< Format for atomic_count_t. */
-
 #endif
 

kernel/arch/ia64/src/interrupt.c

@@ -142 +142 @@
             istate->cr_isr.value, istate->cr_ipsr.value);
         
-        printf("cr.iip=%#0" PRIx64 ", #%u\t(%s)\n",
+        printf("cr.iip=%#0" PRIxPTR ", #%u\t(%s)\n",
             istate->cr_iip, istate->cr_isr.ei,
             symtab_fmt_name_lookup(istate->cr_iip));
-        printf("cr.iipa=%#0" PRIx64 "\t(%s)\n", istate->cr_iipa,
+        printf("cr.iipa=%#0" PRIxPTR "\t(%s)\n", istate->cr_iipa,
             symtab_fmt_name_lookup(istate->cr_iipa));
-        printf("cr.ifa=%#0" PRIx64 "\t(%s)\n", istate->cr_ifa,
+        printf("cr.ifa=%#0" PRIxPTR "\t(%s)\n", istate->cr_ifa,
             symtab_fmt_name_lookup(istate->cr_ifa));
 }