BZ#14985: Remove erroneous EPOLL_NONBLOCK

[Andreas Jaeger]

Could somebody review this, please?

Thanks,
Andreas

On 01/02/2013 09:55 AM, Andreas Jaeger wrote:
> The Linux kernel does not define EPOLL_NONBLOCK at all, so the define we have in the glibc headers is wrong.
>
> Here's a patch to remove this. Ok to commit?
>
> Andreas
>
> 2013-01-02  Andreas Jaeger  <aj@suse.de>
>
> 	[BZ# 14985]
> 	* sysdeps/unix/sysv/linux/sparc/bits/epoll.h (EPOLL_NONBLOCK):
> 	Remove.
> 	* sysdeps/unix/sysv/linux/bits/epoll.h (EPOLL_NONBLOCK): Likewise.
> 	* sysdeps/unix/sysv/linux/x86/bits/epoll.h (EPOLL_NONBLOCK): Likewise.
>
> diff --git a/ports/sysdeps/unix/sysv/linux/alpha/bits/epoll.h b/ports/sysdeps/unix/sysv/linux/alpha/bits/epoll.h
> index 7f9f374..87f527d 100644
> --- a/ports/sysdeps/unix/sysv/linux/alpha/bits/epoll.h
> +++ b/ports/sysdeps/unix/sysv/linux/alpha/bits/epoll.h
> @@ -22,8 +22,6 @@
>   /* Flags to be passed to epoll_create1.  */
>   enum
>     {
> -    EPOLL_CLOEXEC  = 010000000,
> +    EPOLL_CLOEXEC  = 010000000
>   #define EPOLL_CLOEXEC EPOLL_CLOEXEC
> -    EPOLL_NONBLOCK = 000000004
> -#define EPOLL_NONBLOCK EPOLL_NONBLOCK
>     };
> diff --git a/ports/sysdeps/unix/sysv/linux/hppa/sys/epoll.h b/ports/sysdeps/unix/sysv/linux/hppa/sys/epoll.h
> index e06d566..38fe78d 100644
> --- a/ports/sysdeps/unix/sysv/linux/hppa/sys/epoll.h
> +++ b/ports/sysdeps/unix/sysv/linux/hppa/sys/epoll.h
> @@ -33,10 +33,8 @@ typedef __sigset_t sigset_t;
>   /* Flags to be passed to epoll_create1.  */
>   enum
>     {
> -    EPOLL_CLOEXEC = 010000000,
> +    EPOLL_CLOEXEC = 010000000
>   #define EPOLL_CLOEXEC EPOLL_CLOEXEC
> -    EPOLL_NONBLOCK = 00200004 /* HPUX has separate NDELAY & NONBLOCK */
> -#define EPOLL_NONBLOCK EPOLL_NONBLOCK
>     };
>
>
> diff --git a/ports/sysdeps/unix/sysv/linux/mips/bits/epoll.h b/ports/sysdeps/unix/sysv/linux/mips/bits/epoll.h
> index 4c6eb3b..fbe1469 100644
> --- a/ports/sysdeps/unix/sysv/linux/mips/bits/epoll.h
> +++ b/ports/sysdeps/unix/sysv/linux/mips/bits/epoll.h
> @@ -22,8 +22,6 @@
>   /* Flags to be passed to epoll_create1.  */
>   enum
>     {
> -    EPOLL_CLOEXEC = 02000000,
> +    EPOLL_CLOEXEC = 02000000
>   #define EPOLL_CLOEXEC EPOLL_CLOEXEC
> -    EPOLL_NONBLOCK = 00000200
> -#define EPOLL_NONBLOCK EPOLL_NONBLOCK
>     };
> diff --git a/sysdeps/unix/sysv/linux/bits/epoll.h b/sysdeps/unix/sysv/linux/bits/epoll.h
> index 0a49b97..fbe1469 100644
> --- a/sysdeps/unix/sysv/linux/bits/epoll.h
> +++ b/sysdeps/unix/sysv/linux/bits/epoll.h
> @@ -22,8 +22,6 @@
>   /* Flags to be passed to epoll_create1.  */
>   enum
>     {
> -    EPOLL_CLOEXEC = 02000000,
> +    EPOLL_CLOEXEC = 02000000
>   #define EPOLL_CLOEXEC EPOLL_CLOEXEC
> -    EPOLL_NONBLOCK = 00004000
> -#define EPOLL_NONBLOCK EPOLL_NONBLOCK
>     };
> diff --git a/sysdeps/unix/sysv/linux/sparc/bits/epoll.h b/sysdeps/unix/sysv/linux/sparc/bits/epoll.h
> index 5324020..841433f 100644
> --- a/sysdeps/unix/sysv/linux/sparc/bits/epoll.h
> +++ b/sysdeps/unix/sysv/linux/sparc/bits/epoll.h
> @@ -22,8 +22,6 @@
>   /* Flags to be passed to epoll_create1.  */
>   enum
>     {
> -    EPOLL_CLOEXEC = 0x400000,
> +    EPOLL_CLOEXEC = 0x400000
>   #define EPOLL_CLOEXEC EPOLL_CLOEXEC
> -    EPOLL_NONBLOCK = 0x004000
> -#define EPOLL_NONBLOCK EPOLL_NONBLOCK
>     };
> diff --git a/sysdeps/unix/sysv/linux/x86/bits/epoll.h b/sysdeps/unix/sysv/linux/x86/bits/epoll.h
> index be1f5a6..87d0f84 100644
> --- a/sysdeps/unix/sysv/linux/x86/bits/epoll.h
> +++ b/sysdeps/unix/sysv/linux/x86/bits/epoll.h
> @@ -22,10 +22,8 @@
>   /* Flags to be passed to epoll_create1.  */
>   enum
>     {
> -    EPOLL_CLOEXEC = 02000000,
> +    EPOLL_CLOEXEC = 02000000
>   #define EPOLL_CLOEXEC EPOLL_CLOEXEC
> -    EPOLL_NONBLOCK = 00004000
> -#define EPOLL_NONBLOCK EPOLL_NONBLOCK
>     };
>
>   #define __EPOLL_PACKED __attribute__ ((__packed__))
>


-- 
  Andreas Jaeger aj@{suse.com,opensuse.org} Twitter/Identica: jaegerandi
   SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
    GF: Jeff Hawn,Jennifer Guild,Felix Imendörffer,HRB16746 (AG Nürnberg)
     GPG fingerprint = 93A3 365E CE47 B889 DF7F  FED1 389A 563C C272 A126