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

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