* BZ#14985: Remove erroneous EPOLL_NONBLOCK
@ 2013-01-02 8:55 Andreas Jaeger
2013-01-06 19:32 ` Andreas Jaeger
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Andreas Jaeger @ 2013-01-02 8:55 UTC (permalink / raw)
To: libc-alpha, libc-ports
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: BZ#14985: Remove erroneous EPOLL_NONBLOCK
2013-01-02 8:55 BZ#14985: Remove erroneous EPOLL_NONBLOCK Andreas Jaeger
@ 2013-01-06 19:32 ` Andreas Jaeger
2013-01-06 22:14 ` KOSAKI Motohiro
2013-01-08 11:59 ` Andreas Schwab
2 siblings, 0 replies; 4+ messages in thread
From: Andreas Jaeger @ 2013-01-06 19:32 UTC (permalink / raw)
To: libc-alpha, libc-ports
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: BZ#14985: Remove erroneous EPOLL_NONBLOCK
2013-01-02 8:55 BZ#14985: Remove erroneous EPOLL_NONBLOCK Andreas Jaeger
2013-01-06 19:32 ` Andreas Jaeger
@ 2013-01-06 22:14 ` KOSAKI Motohiro
2013-01-08 11:59 ` Andreas Schwab
2 siblings, 0 replies; 4+ messages in thread
From: KOSAKI Motohiro @ 2013-01-06 22:14 UTC (permalink / raw)
To: Andreas Jaeger; +Cc: libc-alpha, libc-ports
On Wed, Jan 2, 2013 at 3:55 AM, Andreas Jaeger <aj@suse.com> 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.
This looks fine to me at least.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: BZ#14985: Remove erroneous EPOLL_NONBLOCK
2013-01-02 8:55 BZ#14985: Remove erroneous EPOLL_NONBLOCK Andreas Jaeger
2013-01-06 19:32 ` Andreas Jaeger
2013-01-06 22:14 ` KOSAKI Motohiro
@ 2013-01-08 11:59 ` Andreas Schwab
2 siblings, 0 replies; 4+ messages in thread
From: Andreas Schwab @ 2013-01-08 11:59 UTC (permalink / raw)
To: Andreas Jaeger; +Cc: libc-alpha, libc-ports
Andreas Jaeger <aj@suse.com> writes:
> [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.
Looks ok if you add the missing changelogs.
Andreas.
--
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-01-08 11:59 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-01-02 8:55 BZ#14985: Remove erroneous EPOLL_NONBLOCK Andreas Jaeger
2013-01-06 19:32 ` Andreas Jaeger
2013-01-06 22:14 ` KOSAKI Motohiro
2013-01-08 11:59 ` Andreas Schwab
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).