Module Name: src
Committed By: pgoyette
Date: Fri Oct 12 10:28:29 UTC 2018
Modified Files:
src/sys/sys [pgoyette-compat]: module_hook.h
Log Message:
Use private-namespace variable ``__hooked'' instead of ``hooked''
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.6 -r1.1.2.7 src/sys/sys/module_hook.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/module_hook.h
diff -u src/sys/sys/module_hook.h:1.1.2.6 src/sys/sys/module_hook.h:1.1.2.7
--- src/sys/sys/module_hook.h:1.1.2.6 Thu Oct 4 02:24:26 2018
+++ src/sys/sys/module_hook.h Fri Oct 12 10:28:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: module_hook.h,v 1.1.2.6 2018/10/04 02:24:26 pgoyette Exp $ */
+/* $NetBSD: module_hook.h,v 1.1.2.7 2018/10/12 10:28:29 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -173,18 +173,18 @@ hook ## _ ## which ## _call decl;
int \
hook ## _ ## which ## _call decl \
{ \
- bool hooked; \
+ bool __hooked; \
int __hook_error, __hook_s; \
\
__hook_s = pserialize_read_enter(); \
- hooked = hook.hooked; \
- if (hooked) { \
+ __hooked = hook.hooked; \
+ if (__hooked) { \
membar_consumer(); \
localcount_acquire(&hook.lc); \
} \
pserialize_read_exit(__hook_s); \
\
- if (hooked) { \
+ if (__hooked) { \
__hook_error = (*hook.which)args; \
localcount_release(&hook.lc, &hook.cv, \
&hook.mtx); \