From owner-svn-src-stable@FreeBSD.ORG  Fri Jan  9 02:33:13 2015
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BE736CB9;
 Fri,  9 Jan 2015 02:33:13 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id AA064EC3;
 Fri,  9 Jan 2015 02:33:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t092XDg3058309;
 Fri, 9 Jan 2015 02:33:13 GMT (envelope-from kib@FreeBSD.org)
Received: (from kib@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t092XDU6058308;
 Fri, 9 Jan 2015 02:33:13 GMT (envelope-from kib@FreeBSD.org)
Message-Id: <201501090233.t092XDU6058308@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org
 using -f
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Fri, 9 Jan 2015 02:33:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r276870 - stable/10/sys/amd64/amd64
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jan 2015 02:33:13 -0000

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) {