From 1dce110f630ea24ecf41edd9da23baa6e795e150 Mon Sep 17 00:00:00 2001 From: Matt Macy Date: Sat, 19 May 2018 03:52:55 +0000 Subject: [PATCH] fix uninitialized variable warning in reader locks --- sys/kern/kern_rwlock.c | 2 +- sys/kern/kern_sx.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_rwlock.c b/sys/kern/kern_rwlock.c index a8ca2974630c..11416654baa7 100644 --- a/sys/kern/kern_rwlock.c +++ b/sys/kern/kern_rwlock.c @@ -887,7 +887,7 @@ __rw_wlock_hard(volatile uintptr_t *c, uintptr_t v LOCK_FILE_LINE_ARG_DEF) #ifdef ADAPTIVE_RWLOCKS int spintries = 0; int i, n; - enum { READERS, WRITER } sleep_reason; + enum { READERS, WRITER } sleep_reason = READERS; #endif uintptr_t x; #ifdef LOCK_PROFILING diff --git a/sys/kern/kern_sx.c b/sys/kern/kern_sx.c index 0b886a02af55..238267f505ea 100644 --- a/sys/kern/kern_sx.c +++ b/sys/kern/kern_sx.c @@ -551,7 +551,7 @@ _sx_xlock_hard(struct sx *sx, uintptr_t x, int opts LOCK_FILE_LINE_ARG_DEF) #ifdef ADAPTIVE_SX volatile struct thread *owner; u_int i, n, spintries = 0; - enum { READERS, WRITER } sleep_reason; + enum { READERS, WRITER } sleep_reason = READERS; bool adaptive; #endif #ifdef LOCK_PROFILING @@ -568,7 +568,7 @@ _sx_xlock_hard(struct sx *sx, uintptr_t x, int opts LOCK_FILE_LINE_ARG_DEF) int64_t all_time = 0; #endif #if defined(KDTRACE_HOOKS) || defined(LOCK_PROFILING) - uintptr_t state; + uintptr_t state = 0; #endif int extra_work = 0; @@ -944,7 +944,7 @@ _sx_slock_hard(struct sx *sx, int opts, uintptr_t x LOCK_FILE_LINE_ARG_DEF) int64_t all_time = 0; #endif #if defined(KDTRACE_HOOKS) || defined(LOCK_PROFILING) - uintptr_t state; + uintptr_t state = 0; #endif int extra_work = 0;