Date: Mon, 8 Sep 2014 04:49:22 GMT From: John-Mark Gurney <jmg@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 1198738 for review Message-ID: <201409080449.s884nM7e020809@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@1198738?ac=10 Change 1198738 by jmg@jmg_carbon2 on 2014/08/14 19:59:11 apparently the resolve -am ignored the changes instead of integrating them... hopefully this will fix it.. Affected files ... .. //depot/projects/opencrypto/sys/sparc64/include/sf_buf.h#3 edit Differences ... ==== //depot/projects/opencrypto/sys/sparc64/include/sf_buf.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2003 Alan L. Cox <alc@cs.rice.edu> + * Copyright (c) 2014 Gleb Smirnoff <glebius@FreeBSD.org> * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -23,37 +23,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/sparc64/include/sf_buf.h 255318 2013-09-06 17:44:13Z glebius $ + * $FreeBSD: head/sys/sparc64/include/sf_buf.h 269782 2014-08-10 16:59:39Z kib $ */ #ifndef _MACHINE_SF_BUF_H_ #define _MACHINE_SF_BUF_H_ -#include <sys/queue.h> - -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 */ -}; - -struct sf_buf * sf_buf_alloc(struct vm_page *m, int flags); -void sf_buf_free(struct sf_buf *sf); - -static __inline vm_offset_t -sf_buf_kva(struct sf_buf *sf) -{ - - return (sf->kva); -} - -static __inline struct vm_page * -sf_buf_page(struct sf_buf *sf) -{ - - return (sf->m); -} +void sf_buf_map(struct sf_buf *, int); +int sf_buf_unmap(struct sf_buf *); #endif /* !_MACHINE_SF_BUF_H_ */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409080449.s884nM7e020809>