svn commit: r191823 - in stable/7/sys: . compat/linux contrib/pf dev/ath/ath_hal dev/cxgb

[Dmitry Chagin]

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 <compat/linux/linux_futex.h>
-
 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 <sys/param.h>
-#include <sys/types.h>
-#include <sys/time.h>
 #include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/queue.h>
 #include <sys/imgact.h>
+#include <sys/kernel.h>
 #include <sys/lock.h>
+#include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/priv.h>
+#include <sys/proc.h>
+#include <sys/queue.h>
 #include <sys/sched.h>
 #include <sys/sx.h>
-#include <sys/malloc.h>
 
 #ifdef COMPAT_LINUX32
 #include <machine/../linux32/linux.h>
@@ -60,8 +59,8 @@ __KERNEL_RCSID(1, "$NetBSD: linux_futex.
 #include <machine/../linux/linux.h>
 #include <machine/../linux/linux_proto.h>
 #endif
-#include <compat/linux/linux_emul.h>
 #include <compat/linux/linux_futex.h>
+#include <compat/linux/linux_emul.h>
 
 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