Changeset 002fd5f in mainline for kernel/arch/sparc64/include

Timestamp:

2017-10-24T04:54:05Z (8 years ago)

Author:

jzr <zarevucky.jiri@…>

Branches:

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

Children:

b639d56

Parents:

9ddcb0b

Message:

Replace parts of system headers with <_bits/…>.

Location:

kernel/arch/sparc64/include/arch

Files:

• asm.h (modified) (1 diff)
• barrier.h (modified) (2 diffs)
• mm/sun4v/tsb.h (modified) (1 diff)
• types.h (modified) (2 diffs)

kernel/arch/sparc64/include/arch/asm.h

@@ -350 +350 @@
         
         pstate.value = pstate_read();
-        pstate.ie = ((pstate_reg_t) ipl).ie;
+        pstate.ie = ((pstate_reg_t)(uint64_t) ipl).ie;
         pstate_write(pstate.value);
 }

kernel/arch/sparc64/include/arch/barrier.h

@@ -37 +37 @@
 
 #include <trace.h>
-
-#ifdef KERNEL
-#include <arch/common.h>
-#else
-#include <libarch/common.h>
-#endif
 
 /*
@@ -88 +82 @@
 NO_TRACE static inline void flush_pipeline(void)
 {
-        uint64_t pc;
+        unsigned long pc;
         
         /*

kernel/arch/sparc64/include/arch/mm/sun4v/tsb.h

@@ -72 +72 @@
 struct pte;
 
-extern void tsb_invalidate(struct as *as, uintptr_t page, uint64_t pages);
+extern void tsb_invalidate(struct as *as, uintptr_t page, size_t pages);
 extern void itsb_pte_copy(struct pte *t);
 extern void dtsb_pte_copy(struct pte *t, bool ro);

kernel/arch/sparc64/include/arch/types.h

@@ -36 +36 @@
 #define KERN_sparc64_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 @@
 typedef uint8_t asi_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