summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornetchild <netchild@FreeBSD.org>2006-08-17 09:50:30 +0000
committernetchild <netchild@FreeBSD.org>2006-08-17 09:50:30 +0000
commita6834221aa1bc6393fa7b599bc7182a149c8c037 (patch)
tree6a8d5548f32783983d70e1f910b85465331606e6
parentd5c64fa9978f9563be3ef34f9a3ce051d3ef4fad (diff)
downloadFreeBSD-src-a6834221aa1bc6393fa7b599bc7182a149c8c037.zip
FreeBSD-src-a6834221aa1bc6393fa7b599bc7182a149c8c037.tar.gz
Fix the DEBUG build:
- linux_emul.c [1] - linux_futex.c [2] Sponsored by: Google SoC 2006 [1] Submitted by: rdivacky [1] netchild [2]
-rw-r--r--sys/compat/linux/linux_emul.c3
-rw-r--r--sys/compat/linux/linux_futex.c5
2 files changed, 3 insertions, 5 deletions
diff --git a/sys/compat/linux/linux_emul.c b/sys/compat/linux/linux_emul.c
index 9d14215..eb4abfc 100644
--- a/sys/compat/linux/linux_emul.c
+++ b/sys/compat/linux/linux_emul.c
@@ -246,9 +246,6 @@ linux_schedtail(void *arg __unused, struct proc *p)
{
struct linux_emuldata *em;
int error = 0;
-#ifdef DEBUG
- struct thread *td = FIRST_THREAD_IN_PROC(p);
-#endif
int *child_set_tid;
if (p->p_sysent != &elf_linux_sysvec)
diff --git a/sys/compat/linux/linux_futex.c b/sys/compat/linux/linux_futex.c
index 889d29d..8e7ee23 100644
--- a/sys/compat/linux/linux_futex.c
+++ b/sys/compat/linux/linux_futex.c
@@ -146,9 +146,10 @@ linux_sys_futex(struct thread *td, struct linux_sys_futex_args *args)
#ifdef DEBUG
if (ldebug(sys_futex))
printf("FUTEX_WAIT %d: val = %d, uaddr = %p, "
- "*uaddr = %d, timeout = %d.%09ld\n",
+ "*uaddr = %d, timeout = %d.%09lu\n",
td->td_proc->p_pid, args->val,
- args->uaddr, val, timeout.tv_sec, timeout.tv_nsec);
+ args->uaddr, val, timeout.tv_sec,
+ (unsigned long)timeout.tv_nsec);
#endif
tv.tv_usec = timeout.tv_sec * 1000000 + timeout.tv_nsec / 1000;
timeout_hz = tvtohz(&tv);
OpenPOWER on IntegriCloud