From: Florian Weimer Date: Wed, 6 Feb 2019 14:23:13 +0000 (+0100) Subject: x86: Remove unnecessary include from lowlevellock.h X-Git-Tag: glibc-2.30~383 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b4333340654113ce912cb0deb8856a87487cc428;p=thirdparty%2Fglibc.git x86: Remove unnecessary 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 . Tested on i386 and x86_64, with and without --enable-systemtap. --- diff --git a/ChangeLog b/ChangeLog index 605346afcdc..f2444576f21 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2019-02-06 Florian Weimer + + * sysdeps/unix/sysv/linux/i386/lowlevellock.h: Do not include + . + * sysdeps/unix/sysv/linux/x86_64/lowlevellock.h: Likewise. + 2019-02-06 Stefan Liebler * 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 63d58aef00c..aa8f4bfdf60 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 - #ifndef __ASSEMBLER__ # include # include diff --git a/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h b/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h index 563b297655d..47d4eabd617 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 - #ifndef __ASSEMBLER__ # include # include