Module Name: src
Committed By: martin
Date: Sat Sep 14 20:53:48 UTC 2013
Modified Files:
src/sys/kern: kern_timeout.c
Log Message:
Nove a CTASSERT to global scope
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/kern/kern_timeout.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_timeout.c
diff -u src/sys/kern/kern_timeout.c:1.46 src/sys/kern/kern_timeout.c:1.47
--- src/sys/kern/kern_timeout.c:1.46 Fri Jun 28 01:21:45 2013
+++ src/sys/kern/kern_timeout.c Sat Sep 14 20:53:48 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_timeout.c,v 1.46 2013/06/28 01:21:45 matt Exp $ */
+/* $NetBSD: kern_timeout.c,v 1.47 2013/09/14 20:53:48 martin Exp $ */
/*-
* Copyright (c) 2003, 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_timeout.c,v 1.46 2013/06/28 01:21:45 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_timeout.c,v 1.47 2013/09/14 20:53:48 martin Exp $");
/*
* Timeouts are kept in a hierarchical timing wheel. The c_time is the
@@ -229,14 +229,14 @@ callout_startup(void)
*
* Per-CPU initialization.
*/
+CTASSERT(sizeof(callout_impl_t) <= sizeof(callout_t));
+
void
callout_init_cpu(struct cpu_info *ci)
{
struct callout_cpu *cc;
int b;
- CTASSERT(sizeof(callout_impl_t) <= sizeof(callout_t));
-
if ((cc = ci->ci_data.cpu_callout) == NULL) {
cc = kmem_zalloc(sizeof(*cc), KM_SLEEP);
if (cc == NULL)
