summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorPhilip Guenther <guenther@cvs.openbsd.org>2016-11-07 00:26:34 +0000
committerPhilip Guenther <guenther@cvs.openbsd.org>2016-11-07 00:26:34 +0000
commitbd87d530432bb59e0e8e9945eb3552c2580af213 (patch)
tree094ceb36ef2db9352c5687de586c5176477f3c21 /sys/dev
parent174c1a4b3e7ca128b5540d3419d42f4d056e96af (diff)
Split PID from TID, giving processes a PID unrelated to the TID of their
initial thread ok jsing@ kettenis@
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/drm/drm_irq.c4
-rw-r--r--sys/dev/wscons/wsdisplay.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/pci/drm/drm_irq.c b/sys/dev/pci/drm/drm_irq.c
index e8b4fbcc025..1f15e48cdeb 100644
--- a/sys/dev/pci/drm/drm_irq.c
+++ b/sys/dev/pci/drm/drm_irq.c
@@ -1111,7 +1111,7 @@ static int drm_queue_vblank_event(struct drm_device *dev, int pipe,
}
e->pipe = pipe;
- e->base.pid = curproc->p_pid;
+ e->base.pid = curproc->p_tid; /* XXX */
e->event.base.type = DRM_EVENT_VBLANK;
e->event.base.length = sizeof e->event;
e->event.user_data = vblwait->request.signal;
@@ -1138,7 +1138,7 @@ static int drm_queue_vblank_event(struct drm_device *dev, int pipe,
DRM_DEBUG("event on vblank count %d, current %d, crtc %d\n",
vblwait->request.sequence, seq, pipe);
- trace_drm_vblank_event_queued(curproc->p_pid, pipe,
+ trace_drm_vblank_event_queued(curproc->p_tid, pipe,
vblwait->request.sequence);
e->event.sequence = vblwait->request.sequence;
diff --git a/sys/dev/wscons/wsdisplay.c b/sys/dev/wscons/wsdisplay.c
index 3169c0aacfd..131c511fc79 100644
--- a/sys/dev/wscons/wsdisplay.c
+++ b/sys/dev/wscons/wsdisplay.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsdisplay.c,v 1.124 2015/09/08 11:13:20 deraadt Exp $ */
+/* $OpenBSD: wsdisplay.c,v 1.125 2016/11/07 00:26:33 guenther Exp $ */
/* $NetBSD: wsdisplay.c,v 1.82 2005/02/27 00:27:52 perry Exp $ */
/*
@@ -1426,7 +1426,7 @@ wsdisplaystart(struct tty *tp)
splx(s);
return;
}
- if (tp->t_outq.c_cc == 0 && tp->t_wsel.si_selpid == 0)
+ if (tp->t_outq.c_cc == 0 && tp->t_wsel.si_seltid == 0)
goto low;
if ((scr = sc->sc_scr[WSDISPLAYSCREEN(tp->t_dev)]) == NULL) {