From owner-svn-src-all@FreeBSD.ORG Fri Aug 29 12:48:38 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id E56E847B; Fri, 29 Aug 2014 12:48:38 +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 D13E2186F; Fri, 29 Aug 2014 12:48:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7TCmchQ034864; Fri, 29 Aug 2014 12:48:38 GMT (envelope-from bz@FreeBSD.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7TCmcBm034863; Fri, 29 Aug 2014 12:48:38 GMT (envelope-from bz@FreeBSD.org) Message-Id: <201408291248.s7TCmcBm034863@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bz set sender to bz@FreeBSD.org using -f From: "Bjoern A. Zeeb" Date: Fri, 29 Aug 2014 12:48:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270808 - head/sys/dev/ixl X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Aug 2014 12:48:39 -0000 Author: bz Date: Fri Aug 29 12:48:38 2014 New Revision: 270808 URL: http://svnweb.freebsd.org/changeset/base/270808 Log: These functions are #defined to "osdep" specific names without the "_mem" extension. Provide prototypes for the actual implementations. Correct function arguments to match the implementations. MFC after: 3 days X-MFC with: r270755 Modified: head/sys/dev/ixl/i40e_alloc.h Modified: head/sys/dev/ixl/i40e_alloc.h ============================================================================== --- head/sys/dev/ixl/i40e_alloc.h Fri Aug 29 12:45:14 2014 (r270807) +++ head/sys/dev/ixl/i40e_alloc.h Fri Aug 29 12:48:38 2014 (r270808) @@ -51,16 +51,15 @@ enum i40e_memory_type { }; /* prototype for functions used for dynamic memory allocation */ -enum i40e_status_code i40e_allocate_dma_mem(struct i40e_hw *hw, +enum i40e_status_code i40e_allocate_dma(struct i40e_hw *hw, struct i40e_dma_mem *mem, - enum i40e_memory_type type, - u64 size, u32 alignment); -enum i40e_status_code i40e_free_dma_mem(struct i40e_hw *hw, + bus_size_t size, u32 alignment); +enum i40e_status_code i40e_free_dma(struct i40e_hw *hw, struct i40e_dma_mem *mem); -enum i40e_status_code i40e_allocate_virt_mem(struct i40e_hw *hw, +enum i40e_status_code i40e_allocate_virt(struct i40e_hw *hw, struct i40e_virt_mem *mem, u32 size); -enum i40e_status_code i40e_free_virt_mem(struct i40e_hw *hw, +enum i40e_status_code i40e_free_virt(struct i40e_hw *hw, struct i40e_virt_mem *mem); #endif /* _I40E_ALLOC_H_ */