diff options
| author | dim <dim@FreeBSD.org> | 2015-07-04 21:50:39 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-07-04 21:50:39 +0000 |
| commit | 6f44bd3256388beb23fd03fdf43ad5d53cf43e29 (patch) | |
| tree | 37590f5c697f4198fdddec33c58aefdef0a5f485 /sys/dev/syscons | |
| parent | cea4c167517a0678c7dbf92a0324088dcbac1035 (diff) | |
| parent | 76b8ff88e56f9ad0639b7e23dd9d1128a0750026 (diff) | |
| download | FreeBSD-src-6f44bd3256388beb23fd03fdf43ad5d53cf43e29.zip FreeBSD-src-6f44bd3256388beb23fd03fdf43ad5d53cf43e29.tar.gz | |
Merge ^/head r284737 through r285152.
Diffstat (limited to 'sys/dev/syscons')
| -rw-r--r-- | sys/dev/syscons/scmouse.c | 2 | ||||
| -rw-r--r-- | sys/dev/syscons/syscons.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/syscons/scmouse.c b/sys/dev/syscons/scmouse.c index 4dbd1a7..5895066 100644 --- a/sys/dev/syscons/scmouse.c +++ b/sys/dev/syscons/scmouse.c @@ -666,7 +666,7 @@ sc_mouse_ioctl(struct tty *tp, u_long cmd, caddr_t data, struct thread *td) mouse = (mouse_info_t*)data; - random_harvest(mouse, sizeof(mouse_info_t), 2, RANDOM_MOUSE); + random_harvest_queue(mouse, sizeof(mouse_info_t), 2, RANDOM_MOUSE); if (cmd == OLD_CONS_MOUSECTL) { static u_char swapb[] = { 0, 4, 2, 6, 1, 5, 3, 7 }; diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index 2ab2889..f109b24 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -3411,7 +3411,7 @@ next_code: sc_touch_scrn_saver(); if (!(flags & SCGETC_CN)) - random_harvest(&c, sizeof(c), 1, RANDOM_KEYBOARD); + random_harvest_queue(&c, sizeof(c), 1, RANDOM_KEYBOARD); if (scp->kbd_mode != K_XLATE) return KEYCHAR(c); |
