From owner-svn-src-stable-11@freebsd.org Fri Sep 23 08:41:19 2016 Return-Path: Delivered-To: svn-src-stable-11@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 C8022BE63A4; Fri, 23 Sep 2016 08:41:19 +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 96A78676; Fri, 23 Sep 2016 08:41:19 +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 u8N8fIA0060222; Fri, 23 Sep 2016 08:41:18 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8N8fIRv060220; Fri, 23 Sep 2016 08:41:18 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201609230841.u8N8fIRv060220@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Fri, 23 Sep 2016 08:41:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r306255 - stable/11/sys/boot/kshim X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Sep 2016 08:41:19 -0000 Author: hselasky Date: Fri Sep 23 08:41:18 2016 New Revision: 306255 URL: https://svnweb.freebsd.org/changeset/base/306255 Log: MFC r305804: Make the callout structure in the boot loader's kernel shim more similar to the kernel one. Modified: stable/11/sys/boot/kshim/bsd_kernel.c stable/11/sys/boot/kshim/bsd_kernel.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/boot/kshim/bsd_kernel.c ============================================================================== --- stable/11/sys/boot/kshim/bsd_kernel.c Fri Sep 23 08:35:56 2016 (r306254) +++ stable/11/sys/boot/kshim/bsd_kernel.c Fri Sep 23 08:41:18 2016 (r306255) @@ -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: stable/11/sys/boot/kshim/bsd_kernel.h ============================================================================== --- stable/11/sys/boot/kshim/bsd_kernel.h Fri Sep 23 08:35:56 2016 (r306254) +++ stable/11/sys/boot/kshim/bsd_kernel.h Fri Sep 23 08:41:18 2016 (r306255) @@ -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;