From owner-p4-projects@FreeBSD.ORG  Fri Sep 26 20:45:18 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 80CDED78; Fri, 26 Sep 2014 20:45:18 +0000 (UTC)
Delivered-To: perforce@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 4177ED76
 for <perforce@freebsd.org>; Fri, 26 Sep 2014 20:45:18 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682: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 13C15335
 for <perforce@freebsd.org>; Fri, 26 Sep 2014 20:45:18 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s8QKjHTm001302
 for <perforce@freebsd.org>; Fri, 26 Sep 2014 20:45:17 GMT
 (envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s8QKjHVB001299
 for perforce@freebsd.org; Fri, 26 Sep 2014 20:45:17 GMT
 (envelope-from jhb@freebsd.org)
Date: Fri, 26 Sep 2014 20:45:17 GMT
Message-Id: <201409262045.s8QKjHVB001299@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 1200850 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects/>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 26 Sep 2014 20:45:18 -0000

http://p4web.freebsd.org/@@1200850?ac=10

Change 1200850 by jhb@jhb_ralph on 2014/09/26 20:44:45

	Missed these.

Affected files ...

.. //depot/projects/multipass/sys/dev/iicbus/iic.h#5 integrate
.. //depot/projects/multipass/sys/sparc64/include/sf_buf.h#3 integrate

Differences ...

==== //depot/projects/multipass/sys/dev/iicbus/iic.h#5 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: head/sys/dev/iicbus/iic.h 210998 2010-08-07 08:31:32Z joel $
+ * $FreeBSD: head/sys/dev/iicbus/iic.h 268564 2014-07-12 06:23:42Z rpaulo $
  *
  */
 #ifndef __IIC_H

==== //depot/projects/multipass/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_ */