svn commit: r276870 - stable/10/sys/amd64/amd64

[Konstantin Belousov]

Author: kib
Date: Fri Jan  9 02:33:12 2015
New Revision: 276870
URL: https://svnweb.freebsd.org/changeset/base/276870

Log:
  MFC r276522:
  Actually remove GIANT_REQUIRED, declared but not done in r263475.
  Style.

Modified:
  stable/10/sys/amd64/amd64/mem.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/amd64/amd64/mem.c
==============================================================================
--- stable/10/sys/amd64/amd64/mem.c	Fri Jan  9 02:30:30 2015	(r276869)
+++ stable/10/sys/amd64/amd64/mem.c	Fri Jan  9 02:33:12 2015	(r276870)
@@ -81,8 +81,6 @@ memrw(struct cdev *dev, struct uio *uio,
 	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) {