From owner-svn-src-all@freebsd.org  Wed Sep 14 11:16:01 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id CC1ABAC4435;
 Wed, 14 Sep 2016 11:16:01 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 8DFF51E1C;
 Wed, 14 Sep 2016 11:16:01 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8EBG0gU082901;
 Wed, 14 Sep 2016 11:16:00 GMT (envelope-from hselasky@FreeBSD.org)
Received: (from hselasky@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8EBG06e082899;
 Wed, 14 Sep 2016 11:16:00 GMT (envelope-from hselasky@FreeBSD.org)
Message-Id: <201609141116.u8EBG06e082899@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: hselasky set sender to
 hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Wed, 14 Sep 2016 11:16:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r305804 - head/sys/boot/kshim
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.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Sep 2016 11:16:01 -0000

Author: hselasky
Date: Wed Sep 14 11:16:00 2016
New Revision: 305804
URL: https://svnweb.freebsd.org/changeset/base/305804

Log:
  Make the callout structure in the boot loader's kernel shim more
  similar to the kernel one.
  
  MFC after:	1 week

Modified:
  head/sys/boot/kshim/bsd_kernel.c
  head/sys/boot/kshim/bsd_kernel.h

Modified: head/sys/boot/kshim/bsd_kernel.c
==============================================================================
--- head/sys/boot/kshim/bsd_kernel.c	Wed Sep 14 10:51:06 2016	(r305803)
+++ head/sys/boot/kshim/bsd_kernel.c	Wed Sep 14 11:16:00 2016	(r305804)
@@ -432,8 +432,8 @@ callout_callback(struct callout *c)
 	}
 	mtx_unlock(&mtx_callout);
 
-	if (c->func)
-		(c->func) (c->arg);
+	if (c->c_func != NULL)
+		(c->c_func) (c->c_arg);
 
 	if (!(c->flags & CALLOUT_RETURNUNLOCKED))
 		mtx_unlock(c->mtx);
@@ -487,8 +487,8 @@ callout_reset(struct callout *c, int to_
 {
 	callout_stop(c);
 
-	c->func = func;
-	c->arg = arg;
+	c->c_func = func;
+	c->c_arg = arg;
 	c->timeout = ticks + to_ticks;
 
 	mtx_lock(&mtx_callout);
@@ -507,8 +507,8 @@ callout_stop(struct callout *c)
 	}
 	mtx_unlock(&mtx_callout);
 
-	c->func = NULL;
-	c->arg = NULL;
+	c->c_func = NULL;
+	c->c_arg = NULL;
 }
 
 void

Modified: head/sys/boot/kshim/bsd_kernel.h
==============================================================================
--- head/sys/boot/kshim/bsd_kernel.h	Wed Sep 14 10:51:06 2016	(r305803)
+++ head/sys/boot/kshim/bsd_kernel.h	Wed Sep 14 11:16:00 2016	(r305804)
@@ -299,8 +299,8 @@ extern volatile int ticks;
 
 struct callout {
 	LIST_ENTRY(callout) entry;
-	callout_fn_t *func;
-	void   *arg;
+	callout_fn_t *c_func;
+	void   *c_arg;
 	struct mtx *mtx;
 	int	flags;
 	int	timeout;