Blame SOURCES/glibc-rh1505492-unused-15.patch

25845f
Declare elision_available in elision_init under the preprocessor
25845f
conditional, to avoid an unused variable warning.
25845f
25845f
Upstream, this has been obsoleted by other elision-related changes.
25845f
25845f
diff --git a/nptl/sysdeps/unix/sysv/linux/x86/elision-conf.c b/nptl/sysdeps/unix/sysv/linux/x86/elision-conf.c
25845f
index 69b4fa4c66e89bc6..cc5efb811352adf1 100644
25845f
--- a/nptl/sysdeps/unix/sysv/linux/x86/elision-conf.c
25845f
+++ b/nptl/sysdeps/unix/sysv/linux/x86/elision-conf.c
25845f
@@ -66,8 +66,8 @@ elision_init (int argc __attribute__ ((unused)),
25845f
 	      char **argv  __attribute__ ((unused)),
25845f
 	      char **environ)
25845f
 {
25845f
-  int elision_available = HAS_CPU_FEATURE (RTM);
25845f
 #ifdef ENABLE_LOCK_ELISION
25845f
+  int elision_available = HAS_CPU_FEATURE (RTM);
25845f
   if (!__libc_enable_secure && elision_available)
25845f
     {
25845f
       /* RHEL 7 specific change: Check if elision is enabled for the