svn commit: r309306 - head/sys/dev/netmap
Ed Maste
emaste at FreeBSD.org
Wed Nov 30 02:00:31 UTC 2016
Author: emaste
Date: Wed Nov 30 02:00:30 2016
New Revision: 309306
URL: https://svnweb.freebsd.org/changeset/base/309306
Log:
netmap: add cast to fix powerpc64 LINT kernel
Attempt to fix powerpc64 LINT kernel broken by r308000. Netmap's use of
a uint64_t wchan seems odd, but in the interest of minimizing this
change just cast through uintptr_t to silence the compiler warning.
Reviewed by: jhb
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D8669
Modified:
head/sys/dev/netmap/netmap_freebsd.c
Modified: head/sys/dev/netmap/netmap_freebsd.c
==============================================================================
--- head/sys/dev/netmap/netmap_freebsd.c Wed Nov 30 01:41:40 2016 (r309305)
+++ head/sys/dev/netmap/netmap_freebsd.c Wed Nov 30 02:00:30 2016 (r309306)
@@ -1024,7 +1024,7 @@ nm_os_kthread_wakeup_worker(struct nm_kt
mtx_lock(&nmk->worker_lock);
nmk->scheduled++;
if (nmk->worker_ctx.cfg.wchan) {
- wakeup((void *)nmk->worker_ctx.cfg.wchan);
+ wakeup((void *)(uintptr_t)nmk->worker_ctx.cfg.wchan);
}
mtx_unlock(&nmk->worker_lock);
}
@@ -1090,8 +1090,8 @@ nm_kthread_worker(void *data)
continue;
} else if (nmk->run) {
/* wait on event with one second timeout */
- msleep_spin((void *)ctx->cfg.wchan, &nmk->worker_lock,
- "nmk_ev", hz);
+ msleep_spin((void *)(uintptr_t)ctx->cfg.wchan,
+ &nmk->worker_lock, "nmk_ev", hz);
nmk->scheduled++;
}
mtx_unlock(&nmk->worker_lock);
More information about the svn-src-all
mailing list