Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/i386/include expose __vaddr_t for segments.h since ...



details:   https://anonhg.NetBSD.org/src/rev/4c090d9935d1
branches:  trunk
changeset: 343194:4c090d9935d1
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Jan 24 18:21:50 2016 +0000

description:
expose __vaddr_t for segments.h since it is a userland api.

diffstat:

 sys/arch/i386/include/segments.h |   4 ++--
 sys/arch/i386/include/types.h    |  13 +++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diffs (63 lines):

diff -r aa50d38f9ab5 -r 4c090d9935d1 sys/arch/i386/include/segments.h
--- a/sys/arch/i386/include/segments.h  Sun Jan 24 17:26:59 2016 +0000
+++ b/sys/arch/i386/include/segments.h  Sun Jan 24 18:21:50 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: segments.h,v 1.54 2011/04/26 15:51:23 joerg Exp $      */
+/*     $NetBSD: segments.h,v 1.55 2016/01/24 18:21:50 christos Exp $   */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -159,7 +159,7 @@
 } __packed;
 
 struct ldt_descriptor {
-       vaddr_t ld_base;
+       __vaddr_t ld_base;
        uint32_t ld_entries;
 } __packed;
 
diff -r aa50d38f9ab5 -r 4c090d9935d1 sys/arch/i386/include/types.h
--- a/sys/arch/i386/include/types.h     Sun Jan 24 17:26:59 2016 +0000
+++ b/sys/arch/i386/include/types.h     Sun Jan 24 18:21:50 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: types.h,v 1.85 2016/01/23 22:31:19 christos Exp $      */
+/*     $NetBSD: types.h,v 1.86 2016/01/24 18:21:50 christos Exp $      */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -41,6 +41,10 @@
 #include <sys/featuretest.h>
 #include <machine/int_types.h>
 
+typedef int                    __register_t;
+typedef unsigned long          __vaddr_t;      /* segments.h */
+typedef unsigned char          __cpu_simple_lock_nv_t;
+
 #if defined(_KERNEL)
 typedef struct label_t {
        int val[6];
@@ -78,7 +82,7 @@
 
 #if defined(_KERNEL) || defined(_KMEMUSER) || defined(_KERNTYPES) || defined(_STANDALONE)
 
-typedef unsigned long  vaddr_t;
+typedef __vaddr_t      vaddr_t;
 typedef unsigned long  vsize_t;
 #define        PRIxVADDR       "lx"
 #define        PRIxVSIZE       "lx"
@@ -86,14 +90,11 @@
 
 typedef int            pmc_evid_t;
 typedef __uint64_t     pmc_ctr_t;
-typedef int            register_t;
+typedef __register_t   register_t;
 #define        PRIxREGISTER    "x"
 
 #endif /* _KERNEL || _KMEMUSER */
 
-typedef int                    __register_t;
-typedef        unsigned char           __cpu_simple_lock_nv_t;
-
 /* __cpu_simple_lock_t used to be a full word. */
 #define        __CPU_SIMPLE_LOCK_PAD
 



Home | Main Index | Thread Index | Old Index