Module Name: src
Committed By: christos
Date: Sun Jan 24 18:21:50 UTC 2016
Modified Files:
src/sys/arch/i386/include: segments.h types.h
Log Message:
expose __vaddr_t for segments.h since it is a userland api.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/i386/include/segments.h
cvs rdiff -u -r1.85 -r1.86 src/sys/arch/i386/include/types.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/include/segments.h
diff -u src/sys/arch/i386/include/segments.h:1.54 src/sys/arch/i386/include/segments.h:1.55
--- src/sys/arch/i386/include/segments.h:1.54 Tue Apr 26 11:51:23 2011
+++ src/sys/arch/i386/include/segments.h Sun Jan 24 13:21:50 2016
@@ -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 @@ struct gate_descriptor {
} __packed;
struct ldt_descriptor {
- vaddr_t ld_base;
+ __vaddr_t ld_base;
uint32_t ld_entries;
} __packed;
Index: src/sys/arch/i386/include/types.h
diff -u src/sys/arch/i386/include/types.h:1.85 src/sys/arch/i386/include/types.h:1.86
--- src/sys/arch/i386/include/types.h:1.85 Sat Jan 23 17:31:19 2016
+++ src/sys/arch/i386/include/types.h Sun Jan 24 13:21:50 2016
@@ -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 @@ typedef __uint64_t psize_t;
#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 unsigned long vsize_t;
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
