aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2019-02-06 15:23:13 +0100
committerFlorian Weimer <fweimer@redhat.com>2019-02-06 15:23:13 +0100
commitb4333340654113ce912cb0deb8856a87487cc428 (patch)
tree22fa5ac4759667cf9736bd0ab4c52585f2a50ca8
parentb6d8a999cd490665c795ad316a49cc22bdde2fa4 (diff)
downloadglibc-b4333340654113ce912cb0deb8856a87487cc428.zip
glibc-b4333340654113ce912cb0deb8856a87487cc428.tar.gz
glibc-b4333340654113ce912cb0deb8856a87487cc428.tar.bz2
x86: Remove unnecessary <stap-probe.h> include from lowlevellock.h
In the i386 case, it appears that the sole remaining LIBC_PROBE was removed in commit a9fe4c5aa8e53ee30f7d0a1c878391d5d6324e6e ("Support six-argument syscalls from C for 32-bit x86, use generic lowlevellock-futex.h (bug 18138)."), when sysdeps/unix/sysv/linux/i386/lowlevellock-futex.h was replaced with the generic version. For x86_64, the relevant change is commit 76f71081cd3fe355b9c18d1fc5e87643c788cfac ("Use generic lowlevellock-futex.h in x86_64 lowlevellock.h."), again by using the generic version of <lowlevellock-futex.h>. Tested on i386 and x86_64, with and without --enable-systemtap.
-rw-r--r--ChangeLog6
-rw-r--r--sysdeps/unix/sysv/linux/i386/lowlevellock.h2
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/lowlevellock.h2
3 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 605346a..f244457 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2019-02-06 Florian Weimer <fweimer@redhat.com>
+
+ * sysdeps/unix/sysv/linux/i386/lowlevellock.h: Do not include
+ <stap-probe.h>.
+ * sysdeps/unix/sysv/linux/x86_64/lowlevellock.h: Likewise.
+
2019-02-06 Stefan Liebler <stli@linux.ibm.com>
* libio/tst-bz24153.c (wide): Use wide char format specifier.
diff --git a/sysdeps/unix/sysv/linux/i386/lowlevellock.h b/sysdeps/unix/sysv/linux/i386/lowlevellock.h
index 63d58ae..aa8f4bf 100644
--- a/sysdeps/unix/sysv/linux/i386/lowlevellock.h
+++ b/sysdeps/unix/sysv/linux/i386/lowlevellock.h
@@ -19,8 +19,6 @@
#ifndef _LOWLEVELLOCK_H
#define _LOWLEVELLOCK_H 1
-#include <stap-probe.h>
-
#ifndef __ASSEMBLER__
# include <time.h>
# include <sys/param.h>
diff --git a/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h b/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
index 563b297..47d4eab 100644
--- a/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
+++ b/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
@@ -19,8 +19,6 @@
#ifndef _LOWLEVELLOCK_H
#define _LOWLEVELLOCK_H 1
-#include <stap-probe.h>
-
#ifndef __ASSEMBLER__
# include <time.h>
# include <sys/param.h>