From owner-p4-projects@FreeBSD.ORG  Thu Jul 22 17:48:48 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 92A4216A4D1; Thu, 22 Jul 2004 17:48:48 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6C78C16A4CE
	for <perforce@freebsd.org>; Thu, 22 Jul 2004 17:48:48 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 686F143D39
	for <perforce@freebsd.org>; Thu, 22 Jul 2004 17:48:48 +0000 (GMT)
	(envelope-from dfr@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6MHmmp7009511
	for <perforce@freebsd.org>; Thu, 22 Jul 2004 17:48:48 GMT
	(envelope-from dfr@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6MHmmBt009508
	for perforce@freebsd.org; Thu, 22 Jul 2004 17:48:48 GMT
	(envelope-from dfr@freebsd.org)
Date: Thu, 22 Jul 2004 17:48:48 GMT
Message-Id: <200407221748.i6MHmmBt009508@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	dfr@freebsd.org using -f
From: Doug Rabson <dfr@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 57936 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Jul 2004 17:48:49 -0000

http://perforce.freebsd.org/chv.cgi?CH=57936

Change 57936 by dfr@dfr_home on 2004/07/22 17:48:03

	Fix integrate botch.

Affected files ...

.. //depot/projects/kse/lib/libc/gen/swapcontext.c#8 integrate

Differences ...

==== //depot/projects/kse/lib/libc/gen/swapcontext.c#8 (text+ko) ====

@@ -31,10 +31,6 @@
 #include <sys/signal.h>
 #include <sys/ucontext.h>
 
-#include <sys/param.h>
-#include <sys/signal.h>
-#include <sys/ucontext.h>
-
 #include <errno.h>
 #include <stddef.h>
 
@@ -45,10 +41,7 @@
 {
 	int ret;
 
-	if ((oucp == NULL) ||
-	    (oucp->uc_mcontext.mc_len != sizeof(mcontext_t)) ||
-	    (ucp == NULL) ||
-	    (ucp->uc_mcontext.mc_len != sizeof(mcontext_t))) {
+	if ((oucp == NULL) || (ucp == NULL)) {
 		errno = EINVAL;
 		return (-1);
 	}