From owner-svn-src-head@FreeBSD.ORG  Fri Jan  2 01:00:39 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D8062D79;
 Fri,  2 Jan 2015 01:00:39 +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 C46DB64D83;
 Fri,  2 Jan 2015 01:00:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0210dvM064364;
 Fri, 2 Jan 2015 01:00:39 GMT (envelope-from kib@FreeBSD.org)
Received: (from kib@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0210dIx064363;
 Fri, 2 Jan 2015 01:00:39 GMT (envelope-from kib@FreeBSD.org)
Message-Id: <201501020100.t0210dIx064363@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, 2 Jan 2015 01:00:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r276522 - head/sys/amd64/amd64
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Jan 2015 01:00:40 -0000

Author: kib
Date: Fri Jan  2 01:00:38 2015
New Revision: 276522
URL: https://svnweb.freebsd.org/changeset/base/276522

Log:
  Actually remove GIANT_REQUIRED, declared but not done in r263475.
  Style.
  
  Sponsored by:	The FreeBSD Foundation
  MFC after:	1 week

Modified:
  head/sys/amd64/amd64/mem.c

Modified: head/sys/amd64/amd64/mem.c
==============================================================================
--- head/sys/amd64/amd64/mem.c	Fri Jan  2 00:57:40 2015	(r276521)
+++ head/sys/amd64/amd64/mem.c	Fri Jan  2 01:00:38 2015	(r276522)
@@ -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) {