From: Andreas Jaeger <aj@suse.com>
To: libc-alpha <libc-alpha@sourceware.org>,
"libc-ports@sourceware.org" <libc-ports@sourceware.org>
Subject: BZ#14985: Remove erroneous EPOLL_NONBLOCK
Date: Wed, 02 Jan 2013 08:55:00 -0000 [thread overview]
Message-ID: <50E3F5F2.3040905@suse.com> (raw)
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
next reply other threads:[~2013-01-02 8:55 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-02 8:55 Andreas Jaeger [this message]
2013-01-06 19:32 ` Andreas Jaeger
2013-01-06 22:14 ` KOSAKI Motohiro
2013-01-08 11:59 ` Andreas Schwab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=50E3F5F2.3040905@suse.com \
--to=aj@suse.com \
--cc=libc-alpha@sourceware.org \
--cc=libc-ports@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).