Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 1 May 2014 13:18:41 +0000 (UTC)
From:      Dmitry Chagin <dchagin@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r265174 - user/dchagin/lemul/sys/compat/linux
Message-ID:  <201405011318.s41DIfYJ053038@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dchagin
Date: Thu May  1 13:18:41 2014
New Revision: 265174
URL: http://svnweb.freebsd.org/changeset/base/265174

Log:
  Fix build linux64 module with DEBUG enabled.

Modified:
  user/dchagin/lemul/sys/compat/linux/linux_misc.c
  user/dchagin/lemul/sys/compat/linux/linux_signal.c
  user/dchagin/lemul/sys/compat/linux/linux_stats.c

Modified: user/dchagin/lemul/sys/compat/linux/linux_misc.c
==============================================================================
--- user/dchagin/lemul/sys/compat/linux/linux_misc.c	Thu May  1 13:01:42 2014	(r265173)
+++ user/dchagin/lemul/sys/compat/linux/linux_misc.c	Thu May  1 13:18:41 2014	(r265174)
@@ -901,7 +901,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, %jd"), path, args->mode,
+		    (intmax_t)args->dev);
 #endif
 
 	switch (args->mode & S_IFMT) {
@@ -1751,8 +1752,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, %jd, %jd, %jd, %jd"), args->option,
+		    (intmax_t)args->arg2, (intmax_t)args->arg3,
+		    (intmax_t)args->arg4, (intmax_t)args->arg5);
 #endif
 
 	switch (args->option) {

Modified: user/dchagin/lemul/sys/compat/linux/linux_signal.c
==============================================================================
--- user/dchagin/lemul/sys/compat/linux/linux_signal.c	Thu May  1 13:01:42 2014	(r265173)
+++ user/dchagin/lemul/sys/compat/linux/linux_signal.c	Thu May  1 13:18:41 2014	(r265174)
@@ -466,8 +466,8 @@ linux_rt_sigtimedwait(struct thread *td,
 #ifdef DEBUG
 		if (ldebug(rt_sigtimedwait))
 			printf(LMSG("linux_rt_sigtimedwait: "
-			    "incoming timeout (%ld/%ld)\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: user/dchagin/lemul/sys/compat/linux/linux_stats.c
==============================================================================
--- user/dchagin/lemul/sys/compat/linux/linux_stats.c	Thu May  1 13:01:42 2014	(r265173)
+++ user/dchagin/lemul/sys/compat/linux/linux_stats.c	Thu May  1 13:18:41 2014	(r265174)
@@ -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, "%jd, *"), (intmax_t)args->dev);
 #endif
 
 	return (EOPNOTSUPP);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405011318.s41DIfYJ053038>