svn commit: r293524 - stable/10/sys/compat/linux

[Dmitry Chagin]

Author: dchagin
Date: Sat Jan  9 15:58:42 2016
New Revision: 293524
URL: https://svnweb.freebsd.org/changeset/base/293524

Log:
  MFC r283419:
  
  Fix compilation with -DDEBUG option.

Modified:
  stable/10/sys/compat/linux/linux_misc.c
  stable/10/sys/compat/linux/linux_signal.c
  stable/10/sys/compat/linux/linux_stats.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/compat/linux/linux_misc.c
==============================================================================
--- stable/10/sys/compat/linux/linux_misc.c	Sat Jan  9 15:57:28 2016	(r293523)
+++ stable/10/sys/compat/linux/linux_misc.c	Sat Jan  9 15:58:42 2016	(r293524)
@@ -993,7 +993,8 @@ linux_mknod(struct thread *td, struct li
 
 #ifdef DEBUG
 	if (ldebug(mknod))
-		printf(ARGS(mknod, "%s, %d, %d"), path, args->mode, args->dev);
+		printf(ARGS(mknod, "%s, %d, %ju"), path, args->mode,
+		    (uintmax_t)args->dev);
 #endif
 
 	switch (args->mode & S_IFMT) {
@@ -1843,8 +1844,9 @@ linux_prctl(struct thread *td, struct li
 
 #ifdef DEBUG
 	if (ldebug(prctl))
-		printf(ARGS(prctl, "%d, %d, %d, %d, %d"), args->option,
-		    args->arg2, args->arg3, args->arg4, args->arg5);
+		printf(ARGS(prctl, "%d, %ju, %ju, %ju, %ju"), args->option,
+		    (uintmax_t)args->arg2, (uintmax_t)args->arg3,
+		    (uintmax_t)args->arg4, (uintmax_t)args->arg5);
 #endif
 
 	switch (args->option) {

Modified: stable/10/sys/compat/linux/linux_signal.c
==============================================================================
--- stable/10/sys/compat/linux/linux_signal.c	Sat Jan  9 15:57:28 2016	(r293523)
+++ stable/10/sys/compat/linux/linux_signal.c	Sat Jan  9 15:58:42 2016	(r293524)
@@ -468,8 +468,8 @@ linux_rt_sigtimedwait(struct thread *td,
 #ifdef DEBUG
 		if (ldebug(rt_sigtimedwait))
 			printf(LMSG("linux_rt_sigtimedwait: "
-			    "incoming timeout (%d/%d)\n"),
-			    ltv.tv_sec, ltv.tv_usec);
+			    "incoming timeout (%jd/%jd)\n"),
+			    (intmax_t)ltv.tv_sec, (intmax_t)ltv.tv_usec);
 #endif
 		tv.tv_sec = (long)ltv.tv_sec;
 		tv.tv_usec = (suseconds_t)ltv.tv_usec;

Modified: stable/10/sys/compat/linux/linux_stats.c
==============================================================================
--- stable/10/sys/compat/linux/linux_stats.c	Sat Jan  9 15:57:28 2016	(r293523)
+++ stable/10/sys/compat/linux/linux_stats.c	Sat Jan  9 15:58:42 2016	(r293524)
@@ -496,7 +496,7 @@ linux_ustat(struct thread *td, struct li
 {
 #ifdef DEBUG
 	if (ldebug(ustat))
-		printf(ARGS(ustat, "%d, *"), args->dev);
+		printf(ARGS(ustat, "%ju, *"), (uintmax_t)args->dev);
 #endif
 
 	return (EOPNOTSUPP);