From owner-svn-src-all@FreeBSD.ORG Tue May 5 15:19:46 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 602251065673; Tue, 5 May 2009 15:19:46 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 42C1B8FC29; Tue, 5 May 2009 15:19:46 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n45FJkTP085116; Tue, 5 May 2009 15:19:46 GMT (envelope-from dchagin@svn.freebsd.org) Received: (from dchagin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n45FJkZ1085113; Tue, 5 May 2009 15:19:46 GMT (envelope-from dchagin@svn.freebsd.org) Message-Id: <200905051519.n45FJkZ1085113@svn.freebsd.org> From: Dmitry Chagin Date: Tue, 5 May 2009 15:19:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r191823 - in stable/7/sys: . compat/linux contrib/pf dev/ath/ath_hal dev/cxgb X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 May 2009 15:19:47 -0000 Author: dchagin Date: Tue May 5 15:19:45 2009 New Revision: 191823 URL: http://svn.freebsd.org/changeset/base/191823 Log: Merge from HEAD to stable/7: r189861: Include linux_futex.h before linux_emul.h r189862: Ignore FUTEX_FD op, as it is done by linux. r189867: Sort include files in the alphabetical order. Approved by: kib (mentor) Modified: stable/7/sys/ (props changed) stable/7/sys/compat/linux/linux_emul.h stable/7/sys/compat/linux/linux_futex.c stable/7/sys/compat/linux/linux_futex.h stable/7/sys/contrib/pf/ (props changed) stable/7/sys/dev/ath/ath_hal/ (props changed) stable/7/sys/dev/cxgb/ (props changed) Modified: stable/7/sys/compat/linux/linux_emul.h ============================================================================== --- stable/7/sys/compat/linux/linux_emul.h Tue May 5 15:03:19 2009 (r191822) +++ stable/7/sys/compat/linux/linux_emul.h Tue May 5 15:19:45 2009 (r191823) @@ -31,8 +31,6 @@ #ifndef _LINUX_EMUL_H_ #define _LINUX_EMUL_H_ -#include - struct linux_emuldata_shared { int refs; pid_t group_pid; Modified: stable/7/sys/compat/linux/linux_futex.c ============================================================================== --- stable/7/sys/compat/linux/linux_futex.c Tue May 5 15:03:19 2009 (r191822) +++ stable/7/sys/compat/linux/linux_futex.c Tue May 5 15:19:45 2009 (r191823) @@ -40,18 +40,17 @@ __KERNEL_RCSID(1, "$NetBSD: linux_futex. #include "opt_compat.h" #include -#include -#include #include -#include -#include #include +#include #include +#include #include #include +#include +#include #include #include -#include #ifdef COMPAT_LINUX32 #include @@ -60,8 +59,8 @@ __KERNEL_RCSID(1, "$NetBSD: linux_futex. #include #include #endif -#include #include +#include struct futex; @@ -276,13 +275,6 @@ linux_sys_futex(struct thread *td, struc FUTEX_SYSTEM_UNLOCK; break; - case LINUX_FUTEX_FD: -#ifdef DEBUG - printf("linux_sys_futex: unimplemented op %d\n", - args->op); -#endif - return (ENOSYS); - case LINUX_FUTEX_WAKE_OP: FUTEX_SYSTEM_LOCK; #ifdef DEBUG Modified: stable/7/sys/compat/linux/linux_futex.h ============================================================================== --- stable/7/sys/compat/linux/linux_futex.h Tue May 5 15:03:19 2009 (r191822) +++ stable/7/sys/compat/linux/linux_futex.h Tue May 5 15:19:45 2009 (r191823) @@ -38,7 +38,7 @@ #define LINUX_FUTEX_WAIT 0 #define LINUX_FUTEX_WAKE 1 -#define LINUX_FUTEX_FD 2 +#define LINUX_FUTEX_FD 2 /* unused */ #define LINUX_FUTEX_REQUEUE 3 #define LINUX_FUTEX_CMP_REQUEUE 4 #define LINUX_FUTEX_WAKE_OP 5