Sat Jan 23 21:19:24 2016 UTC ()
Rename the two register_t uses that leaked to userland __register_t so that
they can be fixed later if we want.


(christos)
diff -r1.17 -r1.18 src/sys/sys/clockctl.h
diff -r1.61 -r1.62 src/sys/sys/ktrace.h
cvs diff -r1.17 -r1.18 src/sys/sys/clockctl.h (expand / switch to unified diff)

--- src/sys/sys/clockctl.h 2015/12/07 06:28:22 1.17
+++ src/sys/sys/clockctl.h 2016/01/23 21:19:24 1.18
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: clockctl.h,v 1.17 2015/12/07 06:28:22 pgoyette Exp $ */ 1/* $NetBSD: clockctl.h,v 1.18 2016/01/23 21:19:24 christos Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2001 The NetBSD Foundation, Inc. 4 * Copyright (c) 2001 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Emmanuel Dreyfus. 8 * by Emmanuel Dreyfus.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -52,27 +52,27 @@ struct clockctl_adjtime { @@ -52,27 +52,27 @@ struct clockctl_adjtime {
52}; 52};
53 53
54#define CLOCKCTL_ADJTIME _IOWR('C', 0x6, struct clockctl_adjtime) 54#define CLOCKCTL_ADJTIME _IOWR('C', 0x6, struct clockctl_adjtime)
55 55
56struct clockctl_clock_settime { 56struct clockctl_clock_settime {
57 clockid_t clock_id; 57 clockid_t clock_id;
58 const struct timespec *tp; 58 const struct timespec *tp;
59}; 59};
60 60
61#define CLOCKCTL_CLOCK_SETTIME _IOW('C', 0x7, struct clockctl_clock_settime) 61#define CLOCKCTL_CLOCK_SETTIME _IOW('C', 0x7, struct clockctl_clock_settime)
62 62
63struct clockctl_ntp_adjtime { 63struct clockctl_ntp_adjtime {
64 struct timex *tp; 64 struct timex *tp;
65 register_t retval; 65 __register_t retval;
66}; 66};
67 67
68#define CLOCKCTL_NTP_ADJTIME _IOWR('C', 0x8, struct clockctl_ntp_adjtime) 68#define CLOCKCTL_NTP_ADJTIME _IOWR('C', 0x8, struct clockctl_ntp_adjtime)
69 69
70#ifdef _KERNEL 70#ifdef _KERNEL
71void clockctlattach(int); 71void clockctlattach(int);
72int clockctlopen(dev_t, int, int, struct lwp *); 72int clockctlopen(dev_t, int, int, struct lwp *);
73int clockctlclose(dev_t, int, int, struct lwp *); 73int clockctlclose(dev_t, int, int, struct lwp *);
74int clockctlioctl(dev_t, u_long, void *, int, struct lwp *); 74int clockctlioctl(dev_t, u_long, void *, int, struct lwp *);
75int clockctl_init(void); 75int clockctl_init(void);
76#endif 76#endif
77 77
78#endif /* _SYS_CLOCKCTL_H_ */ 78#endif /* _SYS_CLOCKCTL_H_ */
cvs diff -r1.61 -r1.62 src/sys/sys/ktrace.h (expand / switch to unified diff)

--- src/sys/sys/ktrace.h 2013/12/09 17:43:58 1.61
+++ src/sys/sys/ktrace.h 2016/01/23 21:19:24 1.62
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: ktrace.h,v 1.61 2013/12/09 17:43:58 pooka Exp $ */ 1/* $NetBSD: ktrace.h,v 1.62 2016/01/23 21:19:24 christos Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1988, 1993 4 * Copyright (c) 1988, 1993
5 * The Regents of the University of California. All rights reserved. 5 * The Regents of the University of California. All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -116,28 +116,28 @@ struct ktr_syscall { @@ -116,28 +116,28 @@ struct ktr_syscall {
116 /* 116 /*
117 * followed by ktr_argsize/sizeof(register_t) "register_t"s 117 * followed by ktr_argsize/sizeof(register_t) "register_t"s
118 */ 118 */
119}; 119};
120 120
121/* 121/*
122 * KTR_SYSRET - return from system call record 122 * KTR_SYSRET - return from system call record
123 */ 123 */
124#define KTR_SYSRET 2 124#define KTR_SYSRET 2
125struct ktr_sysret { 125struct ktr_sysret {
126 short ktr_code; 126 short ktr_code;
127 short ktr_eosys; /* XXX unused */ 127 short ktr_eosys; /* XXX unused */
128 int ktr_error; 128 int ktr_error;
129 register_t ktr_retval; 129 __register_t ktr_retval;
130 register_t ktr_retval_1; 130 __register_t ktr_retval_1;
131}; 131};
132 132
133/* 133/*
134 * KTR_NAMEI - namei record 134 * KTR_NAMEI - namei record
135 */ 135 */
136#define KTR_NAMEI 3 136#define KTR_NAMEI 3
137 /* record contains pathname */ 137 /* record contains pathname */
138 138
139/* 139/*
140 * KTR_GENIO - trace generic process i/o 140 * KTR_GENIO - trace generic process i/o
141 */ 141 */
142#define KTR_GENIO 4 142#define KTR_GENIO 4
143struct ktr_genio { 143struct ktr_genio {