From owner-svn-src-stable@FreeBSD.ORG  Thu Oct 17 14:08:47 2013
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 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 6BB30718;
 Thu, 17 Oct 2013 14:08:47 +0000 (UTC)
 (envelope-from alfred@FreeBSD.org)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 582CC2331;
 Thu, 17 Oct 2013 14:08:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9HE8lEq020160;
 Thu, 17 Oct 2013 14:08:47 GMT (envelope-from alfred@svn.freebsd.org)
Received: (from alfred@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9HE8lu4020159;
 Thu, 17 Oct 2013 14:08:47 GMT (envelope-from alfred@svn.freebsd.org)
Message-Id: <201310171408.r9HE8lu4020159@svn.freebsd.org>
From: Alfred Perlstein <alfred@FreeBSD.org>
Date: Thu, 17 Oct 2013 14:08:47 +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: r256686 - stable/10/sys/ofed/include/linux
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.14
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: Thu, 17 Oct 2013 14:08:47 -0000

Author: alfred
Date: Thu Oct 17 14:08:46 2013
New Revision: 256686
URL: http://svnweb.freebsd.org/changeset/base/256686

Log:
  Fix __free_pages() in the linux shim.
  
  __free_pages() is actaully supposed to take a "struct page *" not
  an address.
  
  MFC: 256546
  
  Approved by:	re

Modified:
  stable/10/sys/ofed/include/linux/gfp.h
Directory Properties:
  stable/10/sys/   (props changed)

Modified: stable/10/sys/ofed/include/linux/gfp.h
==============================================================================
--- stable/10/sys/ofed/include/linux/gfp.h	Thu Oct 17 13:28:57 2013	(r256685)
+++ stable/10/sys/ofed/include/linux/gfp.h	Thu Oct 17 14:08:46 2013	(r256686)
@@ -92,14 +92,14 @@ __free_page(struct page *m)
 }
 
 static inline void
-__free_pages(void *p, unsigned int order)
+__free_pages(struct page *m, unsigned int order)
 {
 	size_t size;
 
-	if (p == 0)
+	if (m == NULL)
 		return;
 	size = PAGE_SIZE << order;
-	kmem_free(kmem_arena, (vm_offset_t)p, size);
+	kmem_free(kmem_arena, (vm_offset_t)page_address(m), size);
 }
 
 /*