diff options
| author | kib <kib@FreeBSD.org> | 2015-01-19 11:07:29 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2015-01-19 11:07:29 +0000 |
| commit | 44ff2e7b6295195e4f265c653b57d314a00ae587 (patch) | |
| tree | fffbeccd31350d1bddfdf01c433f00ba5cbe89ea /sys/amd64/amd64 | |
| parent | 762486d18fccdd071845bf27b076d5384e24e5fd (diff) | |
| download | FreeBSD-src-44ff2e7b6295195e4f265c653b57d314a00ae587.zip FreeBSD-src-44ff2e7b6295195e4f265c653b57d314a00ae587.tar.gz | |
MFC r277055:
Revert r263475: TDP_DEVMEMIO no longer needed.
Diffstat (limited to 'sys/amd64/amd64')
| -rw-r--r-- | sys/amd64/amd64/mem.c | 4 | ||||
| -rw-r--r-- | sys/amd64/amd64/trap.c | 6 |
2 files changed, 1 insertions, 9 deletions
diff --git a/sys/amd64/amd64/mem.c b/sys/amd64/amd64/mem.c index 3a1f4a4..225fe66 100644 --- a/sys/amd64/amd64/mem.c +++ b/sys/amd64/amd64/mem.c @@ -82,10 +82,9 @@ memrw(struct cdev *dev, struct uio *uio, int flags) ssize_t orig_resid; u_long v, vd; u_int c; - int error, sflags; + int error; error = 0; - sflags = curthread_pflags_set(TDP_DEVMEMIO); orig_resid = uio->uio_resid; while (uio->uio_resid > 0 && error == 0) { iov = uio->uio_iov; @@ -151,7 +150,6 @@ memrw(struct cdev *dev, struct uio *uio, int flags) break; } } - curthread_pflags_restore(sflags); /* * Don't return error if any byte was written. Read and write * can return error only if no i/o was performed. diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index a181554..9a8f61e 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -772,12 +772,6 @@ nogo: frame->tf_rip = (long)curpcb->pcb_onfault; return (0); } - if ((td->td_pflags & TDP_DEVMEMIO) != 0) { - KASSERT(curpcb->pcb_onfault != NULL, - ("/dev/mem without pcb_onfault")); - frame->tf_rip = (long)curpcb->pcb_onfault; - return (0); - } trap_fatal(frame, eva); return (-1); } |
