00db10
commit 4d614fe5e0625f197805978730214e5236ef360c
00db10
Author: Roland McGrath <roland@hack.frob.com>
00db10
Date:   Thu Jul 3 19:17:00 2014 -0700
00db10
00db10
    S390: Quash unused variable warning due to no-op THREAD_SET_POINTER_GUARD.
00db10
00db10
Conflicts:
00db10
	sysdeps/s390/nptl/tls.h
00db10
00db10
Change applied to nptl/sysdeps/s390/tls.h instead.
00db10
00db10
diff --git a/nptl/sysdeps/s390/tls.h b/nptl/sysdeps/s390/tls.h
00db10
index 580196b7bfee3046..b3ba0ecc20ce0fcc 100644
00db10
--- a/nptl/sysdeps/s390/tls.h
00db10
+++ b/nptl/sysdeps/s390/tls.h
00db10
@@ -170,7 +170,7 @@ typedef struct
00db10
    use stack_guard as pointer_guard.  */
00db10
 #define THREAD_GET_POINTER_GUARD() \
00db10
   THREAD_GETMEM (THREAD_SELF, header.stack_guard)
00db10
-#define THREAD_SET_POINTER_GUARD(value)
00db10
+#define THREAD_SET_POINTER_GUARD(value)	((void) (value))
00db10
 #define THREAD_COPY_POINTER_GUARD(descr)
00db10
 
00db10
 /* Get and set the global scope generation counter in struct pthread.  */