PERFORCE change 79217 for review
Peter Wemm
peter at FreeBSD.org
Thu Jun 30 00:48:09 GMT 2005
http://perforce.freebsd.org/chv.cgi?CH=79217
Change 79217 by peter at peter_daintree on 2005/06/30 00:47:47
IFC @79216
Affected files ...
.. //depot/projects/hammer/lib/libc/i386/gen/_set_tp.c#8 integrate
.. //depot/projects/hammer/lib/libpthread/arch/i386/i386/pthread_md.c#11 integrate
.. //depot/projects/hammer/lib/libpthread/arch/i386/include/pthread_md.h#16 integrate
.. //depot/projects/hammer/libexec/rtld-elf/i386/reloc.c#10 integrate
.. //depot/projects/hammer/sys/amd64/amd64/exception.S#40 integrate
.. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#100 integrate
.. //depot/projects/hammer/sys/amd64/amd64/trap.c#68 integrate
.. //depot/projects/hammer/sys/conf/options#80 integrate
.. //depot/projects/hammer/sys/conf/options.amd64#37 integrate
.. //depot/projects/hammer/sys/conf/options.i386#38 integrate
.. //depot/projects/hammer/sys/conf/options.pc98#34 integrate
.. //depot/projects/hammer/sys/fs/procfs/procfs_ioctl.c#8 integrate
.. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#47 integrate
.. //depot/projects/hammer/sys/i386/i386/trap.c#37 integrate
.. //depot/projects/hammer/sys/kern/subr_kdb.c#12 integrate
.. //depot/projects/hammer/sys/kern/sys_generic.c#24 integrate
Differences ...
==== //depot/projects/hammer/lib/libc/i386/gen/_set_tp.c#8 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libc/i386/gen/_set_tp.c,v 1.5 2005/04/26 20:51:15 peter Exp $
+ * $FreeBSD: src/lib/libc/i386/gen/_set_tp.c,v 1.6 2005/06/29 23:15:35 peter Exp $
*/
#include <string.h>
==== //depot/projects/hammer/lib/libpthread/arch/i386/i386/pthread_md.c#11 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libpthread/arch/i386/i386/pthread_md.c,v 1.6 2005/04/26 20:41:47 peter Exp $");
+__FBSDID("$FreeBSD: src/lib/libpthread/arch/i386/i386/pthread_md.c,v 1.7 2005/06/29 23:15:36 peter Exp $");
#include <sys/types.h>
#include <machine/cpufunc.h>
==== //depot/projects/hammer/lib/libpthread/arch/i386/include/pthread_md.h#16 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libpthread/arch/i386/include/pthread_md.h,v 1.15 2005/04/26 20:41:48 peter Exp $
+ * $FreeBSD: src/lib/libpthread/arch/i386/include/pthread_md.h,v 1.16 2005/06/29 23:15:36 peter Exp $
*/
/*
* Machine-dependent thread prototypes/definitions for the thread kernel.
==== //depot/projects/hammer/libexec/rtld-elf/i386/reloc.c#10 (text+ko) ====
@@ -22,7 +22,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/libexec/rtld-elf/i386/reloc.c,v 1.17 2005/04/27 13:17:23 davidxu Exp $
+ * $FreeBSD: src/libexec/rtld-elf/i386/reloc.c,v 1.18 2005/06/29 23:15:36 peter Exp $
*/
/*
==== //depot/projects/hammer/sys/amd64/amd64/exception.S#40 (text+ko) ====
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.124 2005/06/24 00:38:36 peter Exp $
+ * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.125 2005/06/30 00:26:54 peter Exp $
*/
#include "opt_atpic.h"
==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#100 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.259 2005/06/09 18:23:54 ups Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.260 2005/06/29 23:23:16 peter Exp $");
#include "opt_cpu.h"
#include "opt_kdb.h"
==== //depot/projects/hammer/sys/amd64/amd64/trap.c#68 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.288 2005/06/25 22:14:42 ups Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.289 2005/06/29 23:23:16 peter Exp $");
/*
* AMD64 Trap and System call handling
==== //depot/projects/hammer/sys/conf/options#80 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.509 2005/06/24 21:43:46 dwhite Exp $
+# $FreeBSD: src/sys/conf/options,v 1.510 2005/06/30 00:09:18 peter Exp $
#
# On the handling of kernel options
#
==== //depot/projects/hammer/sys/conf/options.amd64#37 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options.amd64,v 1.20 2005/04/30 20:00:58 dwhite Exp $
+# $FreeBSD: src/sys/conf/options.amd64,v 1.21 2005/06/29 23:23:16 peter Exp $
# Options specific to AMD64 platform kernels
AUTO_EOI_1 opt_auto_eoi.h
==== //depot/projects/hammer/sys/conf/options.i386#38 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options.i386,v 1.223 2005/06/21 10:17:54 dumbbell Exp $
+# $FreeBSD: src/sys/conf/options.i386,v 1.224 2005/06/29 23:23:16 peter Exp $
# Options specific to the i386 platform kernels
AUTO_EOI_1 opt_auto_eoi.h
==== //depot/projects/hammer/sys/conf/options.pc98#34 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options.pc98,v 1.187 2005/06/24 13:19:09 des Exp $
+# $FreeBSD: src/sys/conf/options.pc98,v 1.188 2005/06/29 23:23:16 peter Exp $
# Options specific to the pc98 platform kernels
AUTO_EOI_1 opt_auto_eoi.h
==== //depot/projects/hammer/sys/fs/procfs/procfs_ioctl.c#8 (text+ko) ====
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/fs/procfs/procfs_ioctl.c,v 1.10 2003/12/07 17:40:00 des Exp $
+ * $FreeBSD: src/sys/fs/procfs/procfs_ioctl.c,v 1.11 2005/06/30 00:19:08 peter Exp $
*/
#include "opt_compat.h"
@@ -75,19 +75,19 @@
PROC_LOCK(p);
error = 0;
switch (cmd) {
-#if defined(COMPAT_FREEBSD5) || defined(COMPAT_FREEBSD4)
+#if defined(COMPAT_FREEBSD5) || defined(COMPAT_FREEBSD4) || defined(COMPAT_43)
case _IOC(IOC_IN, 'p', 1, 0):
#endif
case PIOCBIS:
p->p_stops |= *(uintptr_t *)data;
break;
-#if defined(COMPAT_FREEBSD5) || defined(COMPAT_FREEBSD4)
+#if defined(COMPAT_FREEBSD5) || defined(COMPAT_FREEBSD4) || defined(COMPAT_43)
case _IOC(IOC_IN, 'p', 2, 0):
#endif
case PIOCBIC:
p->p_stops &= ~*(uintptr_t *)data;
break;
-#if defined(COMPAT_FREEBSD5) || defined(COMPAT_FREEBSD4)
+#if defined(COMPAT_FREEBSD5) || defined(COMPAT_FREEBSD4) || defined(COMPAT_43)
case _IOC(IOC_IN, 'p', 3, 0):
#endif
case PIOCSFL:
@@ -135,7 +135,7 @@
ps32->val = p->p_step ? p->p_xstat : 0;
break;
#endif
-#if defined(COMPAT_FREEBSD5) || defined(COMPAT_FREEBSD4)
+#if defined(COMPAT_FREEBSD5) || defined(COMPAT_FREEBSD4) || defined(COMPAT_43)
case _IOC(IOC_IN, 'p', 5, 0):
#endif
case PIOCCONT:
==== //depot/projects/hammer/sys/i386/i386/mp_machdep.c#47 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.251 2005/06/09 18:23:53 ups Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.252 2005/06/29 23:23:16 peter Exp $");
#include "opt_apic.h"
#include "opt_cpu.h"
==== //depot/projects/hammer/sys/i386/i386/trap.c#37 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/trap.c,v 1.276 2005/06/25 22:14:42 ups Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/trap.c,v 1.277 2005/06/29 23:23:16 peter Exp $");
/*
* 386 Trap and System call handling
==== //depot/projects/hammer/sys/kern/subr_kdb.c#12 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/subr_kdb.c,v 1.11 2005/04/30 20:00:59 dwhite Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/subr_kdb.c,v 1.12 2005/06/29 23:23:16 peter Exp $");
#include "opt_kdb.h"
==== //depot/projects/hammer/sys/kern/sys_generic.c#24 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/sys_generic.c,v 1.144 2005/03/31 22:51:18 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/sys_generic.c,v 1.145 2005/06/30 00:19:08 peter Exp $");
#include "opt_compat.h"
#include "opt_ktrace.h"
@@ -535,7 +535,7 @@
size = IOCPARM_LEN(com);
if ((size > IOCPARM_MAX) ||
((com & (IOC_VOID | IOC_IN | IOC_OUT)) == 0) ||
-#ifdef COMPAT_FREEBSD5
+#if defined(COMPAT_FREEBSD5) || defined(COMPAT_FREEBSD4) || defined(COMPAT_43)
((com & IOC_OUT) && size == 0) ||
#else
((com & (IOC_IN | IOC_OUT)) && size == 0) ||
More information about the p4-projects
mailing list