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

[Dmitry Chagin]

Author: dchagin
Date: Mon May 25 20:35:41 2009
New Revision: 192770
URL: http://svn.freebsd.org/changeset/base/192770

Log:
  Merge r191880 from HEAD to stable/7:
  
  Change linux struct tms definition to match actual linux one.
  
  Approved by:	kib (mentor)

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/compat/linux/linux_misc.c
  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_misc.c
==============================================================================
--- stable/7/sys/compat/linux/linux_misc.c	Mon May 25 20:24:36 2009	(r192769)
+++ stable/7/sys/compat/linux/linux_misc.c	Mon May 25 20:35:41 2009	(r192770)
@@ -655,10 +655,10 @@ linux_time(struct thread *td, struct lin
 }
 
 struct l_times_argv {
-	l_long	tms_utime;
-	l_long	tms_stime;
-	l_long	tms_cutime;
-	l_long	tms_cstime;
+	l_clock_t	tms_utime;
+	l_clock_t	tms_stime;
+	l_clock_t	tms_cutime;
+	l_clock_t	tms_cstime;
 };
 
 #define CLK_TCK 100			/* Linux uses 100 */