summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkib <kib@FreeBSD.org>2015-01-09 02:33:12 +0000
committerkib <kib@FreeBSD.org>2015-01-09 02:33:12 +0000
commitb085354527cc8071757ab87d86b538b2e52133eb (patch)
tree57fc41d748973eed94df35e254641b34a5f71a2d
parent7e00152384da1c3e775cf3cc30d49a8fce6bf2d0 (diff)
downloadFreeBSD-src-b085354527cc8071757ab87d86b538b2e52133eb.zip
FreeBSD-src-b085354527cc8071757ab87d86b538b2e52133eb.tar.gz
MFC r276522:
Actually remove GIANT_REQUIRED, declared but not done in r263475. Style.
-rw-r--r--sys/amd64/amd64/mem.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/amd64/amd64/mem.c b/sys/amd64/amd64/mem.c
index 5a4d8a9..170da3f 100644
--- a/sys/amd64/amd64/mem.c
+++ b/sys/amd64/amd64/mem.c
@@ -81,8 +81,6 @@ memrw(struct cdev *dev, struct uio *uio, int flags)
int error, o, sflags;
vm_offset_t addr, eaddr;
- GIANT_REQUIRED;
-
error = 0;
c = 0;
sflags = curthread_pflags_set(TDP_DEVMEMIO);
@@ -110,8 +108,7 @@ kmemphys:
}
error = uiomove((void *)v, (int)c, uio);
continue;
- }
- else if (dev2unit(dev) == CDEV_MINOR_KMEM) {
+ } else if (dev2unit(dev) == CDEV_MINOR_KMEM) {
v = uio->uio_offset;
if (v >= DMAP_MIN_ADDRESS && v < DMAP_MAX_ADDRESS) {
OpenPOWER on IntegriCloud