From owner-svn-src-projects@FreeBSD.ORG Sun Aug 24 10:33:49 2014 Return-Path: Delivered-To: svn-src-projects@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 0AFA5288; Sun, 24 Aug 2014 10:33:49 +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 E8A0D3F27; Sun, 24 Aug 2014 10:33:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OAXmvq026226; Sun, 24 Aug 2014 10:33:48 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OAXm7R026225; Sun, 24 Aug 2014 10:33:48 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201408241033.s7OAXm7R026225@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Sun, 24 Aug 2014 10:33:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r270449 - projects/arm64/sys/arm64/include X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 10:33:49 -0000 Author: andrew Date: Sun Aug 24 10:33:48 2014 New Revision: 270449 URL: http://svnweb.freebsd.org/changeset/base/270449 Log: Update sf_buf.h to be a straight copy of the amd64 version. Modified: projects/arm64/sys/arm64/include/sf_buf.h Modified: projects/arm64/sys/arm64/include/sf_buf.h ============================================================================== --- projects/arm64/sys/arm64/include/sf_buf.h Sun Aug 24 09:47:39 2014 (r270448) +++ projects/arm64/sys/arm64/include/sf_buf.h Sun Aug 24 10:33:48 2014 (r270449) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2003 Alan L. Cox + * Copyright (c) 2003, 2005 Alan L. Cox * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -29,28 +29,23 @@ #ifndef _MACHINE_SF_BUF_H_ #define _MACHINE_SF_BUF_H_ -#include - -struct vm_page; - -struct sf_buf { - SLIST_ENTRY(sf_buf) free_list; /* list of free buffer slots */ - struct vm_page *m; /* currently mapped page */ - vm_offset_t kva; /* va of mapping */ -}; - -static __inline vm_offset_t +/* + * On this machine, the only purpose for which sf_buf is used is to implement + * an opaque pointer required by the machine-independent parts of the kernel. + * That pointer references the vm_page that is "mapped" by the sf_buf. The + * actual mapping is provided by the direct virtual-to-physical mapping. + */ +static inline vm_offset_t sf_buf_kva(struct sf_buf *sf) { - return (sf->kva); + return (PHYS_TO_DMAP(VM_PAGE_TO_PHYS((vm_page_t)sf))); } -static __inline struct vm_page * +static inline vm_page_t sf_buf_page(struct sf_buf *sf) { - return (sf->m); + return ((vm_page_t)sf); } - #endif /* !_MACHINE_SF_BUF_H_ */