x86: Remove unnecessary <stap-probe.h> include from lowlevellock.h

Message ID 87munbl2cz.fsf@oldenburg2.str.redhat.com
State New
Headers show
Series
  • x86: Remove unnecessary <stap-probe.h> include from lowlevellock.h
Related show

Commit Message

Florian Weimer Feb. 4, 2019, 8:34 p.m.
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.

2019-02-04  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.

Comments

Adhemerval Zanella Feb. 6, 2019, 2:07 p.m. | #1
On 04/02/2019 18:34, Florian Weimer wrote:
> 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.
> 
> 2019-02-04  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.

LGTM, thanks.

> 
> diff --git a/sysdeps/unix/sysv/linux/i386/lowlevellock.h b/sysdeps/unix/sysv/linux/i386/lowlevellock.h
> index 63d58aef00..aa8f4bfdf6 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 563b297655..47d4eabd61 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>
>

Patch

diff --git a/sysdeps/unix/sysv/linux/i386/lowlevellock.h b/sysdeps/unix/sysv/linux/i386/lowlevellock.h
index 63d58aef00..aa8f4bfdf6 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 563b297655..47d4eabd61 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>