Cleanup ppc bits/ipc.h

Message ID 569E6CE5.3020909@linux.vnet.ibm.com
State Committed
Headers

Commit Message

Paul E. Murphy Jan. 19, 2016, 5:05 p.m. UTC
  Ages ago (commit e9dcb08) the ipc syscalls were inlined and
eventually abstracted away any need for direct __ipc calls.

2016-01-19  Paul E. Murphy  <murphyp@linux.vnet.ibm.com>

	[BZ #18560]
	* sysdeps/unix/sysv/linux/powerpc/bits/ipc.h (__ipc): Remove.
	(IPCOP_semop): Likewise.
	(IPCOP_semget): Likewise.
	(IPCOP_semctl): Likewise.
	(IPCOP_msgsnd): Likewise.
	(IPCOP_msgrcv): Likewise.
	(IPCOP_msgget): Likewise.
	(IPCOP_msgctl): Likewise.
	(IPCOP_shmat): Likewise.
	(IPCOP_shmdt): Likewise.
	(IPCOP_shmget): Likewise.
	(IPCOP_shmctl): Likewise.
---
 sysdeps/unix/sysv/linux/powerpc/bits/ipc.h | 24 ------------------------
 1 file changed, 24 deletions(-)
  

Comments

Paul E. Murphy Jan. 22, 2016, 4:30 p.m. UTC | #1
Ping. Adding Adhemerval.

Is this acceptable to go in during the freeze, or should I hold off?

I wasn't sure so I threw it over the fence. This is a user visible
header specifying a non-existent function.

On 01/19/2016 11:05 AM, Paul E. Murphy wrote:
> Ages ago (commit e9dcb08) the ipc syscalls were inlined and
> eventually abstracted away any need for direct __ipc calls.
> 
> 2016-01-19  Paul E. Murphy  <murphyp@linux.vnet.ibm.com>
> 
> 	[BZ #18560]
> 	* sysdeps/unix/sysv/linux/powerpc/bits/ipc.h (__ipc): Remove.
> 	(IPCOP_semop): Likewise.
> 	(IPCOP_semget): Likewise.
> 	(IPCOP_semctl): Likewise.
> 	(IPCOP_msgsnd): Likewise.
> 	(IPCOP_msgrcv): Likewise.
> 	(IPCOP_msgget): Likewise.
> 	(IPCOP_msgctl): Likewise.
> 	(IPCOP_shmat): Likewise.
> 	(IPCOP_shmdt): Likewise.
> 	(IPCOP_shmget): Likewise.
> 	(IPCOP_shmctl): Likewise.
> ---
>  sysdeps/unix/sysv/linux/powerpc/bits/ipc.h | 24 ------------------------
>  1 file changed, 24 deletions(-)
> 
> diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/ipc.h b/sysdeps/unix/sysv/linux/powerpc/bits/ipc.h
> index 9502bf9..5a87ac3 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/bits/ipc.h
> +++ b/sysdeps/unix/sysv/linux/powerpc/bits/ipc.h
> @@ -52,27 +52,3 @@ struct ipc_perm
>      __uint64_t __glibc_reserved1;
>      __uint64_t __glibc_reserved2;
>    };
> -
> -
> -__BEGIN_DECLS
> -
> -/* The actual system call: all functions are multiplexed by this.  */
> -extern int __ipc (int __call, int __first, int __second, int __third,
> -		  void *__ptr) __THROW;
> -
> -__END_DECLS
> -
> -#ifdef __USE_GNU
> -/* The codes for the functions to use the multiplexer `__ipc'.  */
> -# define IPCOP_semop	 1
> -# define IPCOP_semget	 2
> -# define IPCOP_semctl	 3
> -# define IPCOP_msgsnd	11
> -# define IPCOP_msgrcv	12
> -# define IPCOP_msgget	13
> -# define IPCOP_msgctl	14
> -# define IPCOP_shmat	21
> -# define IPCOP_shmdt	22
> -# define IPCOP_shmget	23
> -# define IPCOP_shmctl	24
> -#endif
>
  
Adhemerval Zanella Netto Jan. 22, 2016, 4:59 p.m. UTC | #2
LGTM and I will let ppc maintainer the final answer.

On 22-01-2016 14:30, Paul E. Murphy wrote:
> Ping. Adding Adhemerval.
> 
> Is this acceptable to go in during the freeze, or should I hold off?
> 
> I wasn't sure so I threw it over the fence. This is a user visible
> header specifying a non-existent function.
> 
> On 01/19/2016 11:05 AM, Paul E. Murphy wrote:
>> Ages ago (commit e9dcb08) the ipc syscalls were inlined and
>> eventually abstracted away any need for direct __ipc calls.
>>
>> 2016-01-19  Paul E. Murphy  <murphyp@linux.vnet.ibm.com>
>>
>> 	[BZ #18560]
>> 	* sysdeps/unix/sysv/linux/powerpc/bits/ipc.h (__ipc): Remove.
>> 	(IPCOP_semop): Likewise.
>> 	(IPCOP_semget): Likewise.
>> 	(IPCOP_semctl): Likewise.
>> 	(IPCOP_msgsnd): Likewise.
>> 	(IPCOP_msgrcv): Likewise.
>> 	(IPCOP_msgget): Likewise.
>> 	(IPCOP_msgctl): Likewise.
>> 	(IPCOP_shmat): Likewise.
>> 	(IPCOP_shmdt): Likewise.
>> 	(IPCOP_shmget): Likewise.
>> 	(IPCOP_shmctl): Likewise.

Just a nit: usually for such change the CL entry should in the form:

        [__USE_GNU] (IPCOP_semop): Likewise.

>> ---
>>  sysdeps/unix/sysv/linux/powerpc/bits/ipc.h | 24 ------------------------
>>  1 file changed, 24 deletions(-)
>>
>> diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/ipc.h b/sysdeps/unix/sysv/linux/powerpc/bits/ipc.h
>> index 9502bf9..5a87ac3 100644
>> --- a/sysdeps/unix/sysv/linux/powerpc/bits/ipc.h
>> +++ b/sysdeps/unix/sysv/linux/powerpc/bits/ipc.h
>> @@ -52,27 +52,3 @@ struct ipc_perm
>>      __uint64_t __glibc_reserved1;
>>      __uint64_t __glibc_reserved2;
>>    };
>> -
>> -
>> -__BEGIN_DECLS
>> -
>> -/* The actual system call: all functions are multiplexed by this.  */
>> -extern int __ipc (int __call, int __first, int __second, int __third,
>> -		  void *__ptr) __THROW;
>> -
>> -__END_DECLS
>> -
>> -#ifdef __USE_GNU
>> -/* The codes for the functions to use the multiplexer `__ipc'.  */
>> -# define IPCOP_semop	 1
>> -# define IPCOP_semget	 2
>> -# define IPCOP_semctl	 3
>> -# define IPCOP_msgsnd	11
>> -# define IPCOP_msgrcv	12
>> -# define IPCOP_msgget	13
>> -# define IPCOP_msgctl	14
>> -# define IPCOP_shmat	21
>> -# define IPCOP_shmdt	22
>> -# define IPCOP_shmget	23
>> -# define IPCOP_shmctl	24
>> -#endif
>>
>
  
Tulio Magno Quites Machado Filho Jan. 25, 2016, 12:38 p.m. UTC | #3
Adhemerval Zanella <adhemerval.zanella@linaro.org> writes:

> LGTM and I will let ppc maintainer the final answer.
>
> On 22-01-2016 14:30, Paul E. Murphy wrote:
>> Ping. Adding Adhemerval.
>> 
>> Is this acceptable to go in during the freeze, or should I hold off?
>> 
>> I wasn't sure so I threw it over the fence. This is a user visible
>> header specifying a non-existent function.

LGTM too.

Pushed for 2.23 with commit ID 9200e581.

Thanks!
  

Patch

diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/ipc.h b/sysdeps/unix/sysv/linux/powerpc/bits/ipc.h
index 9502bf9..5a87ac3 100644
--- a/sysdeps/unix/sysv/linux/powerpc/bits/ipc.h
+++ b/sysdeps/unix/sysv/linux/powerpc/bits/ipc.h
@@ -52,27 +52,3 @@  struct ipc_perm
     __uint64_t __glibc_reserved1;
     __uint64_t __glibc_reserved2;
   };
-
-
-__BEGIN_DECLS
-
-/* The actual system call: all functions are multiplexed by this.  */
-extern int __ipc (int __call, int __first, int __second, int __third,
-		  void *__ptr) __THROW;
-
-__END_DECLS
-
-#ifdef __USE_GNU
-/* The codes for the functions to use the multiplexer `__ipc'.  */
-# define IPCOP_semop	 1
-# define IPCOP_semget	 2
-# define IPCOP_semctl	 3
-# define IPCOP_msgsnd	11
-# define IPCOP_msgrcv	12
-# define IPCOP_msgget	13
-# define IPCOP_msgctl	14
-# define IPCOP_shmat	21
-# define IPCOP_shmdt	22
-# define IPCOP_shmget	23
-# define IPCOP_shmctl	24
-#endif