commit ce89dc9649b789e85948d5da11145e34cafa2bcf
Author: Stefan Liebler <stli@linux.ibm.com>
Date:   Thu Sep 19 11:17:20 2019 +0200

    S390: Use _HP_TIMING_S390_H instead of _HP_TIMING_H.
    
    Use macro _HP_TIMING_S390_H instead of _HP_TIMING_H
    in s390 specific hp-timing.h
    
    ChangeLog:
    
            * sysdeps/s390/hp-timing.h (_HP_TIMING_H): Undefine.
            (_HP_TIMING_S390_H): Define.

diff --git a/sysdeps/s390/hp-timing.h b/sysdeps/s390/hp-timing.h
index 793fb66a4d..c5c605c937 100644
--- a/sysdeps/s390/hp-timing.h
+++ b/sysdeps/s390/hp-timing.h
@@ -16,12 +16,12 @@
    License along with the GNU C Library.  If not, see
    <https://www.gnu.org/licenses/>.  */
 
-#ifndef _HP_TIMING_H
+#ifndef _HP_TIMING_S390_H
+#define _HP_TIMING_S390_H	1
 
 /* The stckf instruction is available starting with z9-109 zarch CPUs.
    As there is no extra configure check for z9-109, the z10 one is used.  */
 #ifdef HAVE_S390_MIN_Z10_ZARCH_ASM_SUPPORT
-# define _HP_TIMING_H	1
 # include <hp-timing-common.h>
 
 /* We use 64 bit values for the times.