r3189 - in glibc-package/trunk/debian: . patches patches/any
Author: aurel32
Date: 2008-11-04 16:22:45 +0000 (Tue, 04 Nov 2008)
New Revision: 3189
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/any/cvs-eventfd.diff
glibc-package/trunk/debian/patches/series
Log:
Revert previous commit, eventfd2 is only present in >= 2.6.27
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2008-11-04 15:36:51 UTC (rev 3188)
+++ glibc-package/trunk/debian/changelog 2008-11-04 16:22:45 UTC (rev 3189)
@@ -8,8 +8,6 @@
getaddrinfo_a segfaults. Closes: bug#495007.
* debhelper.in/locales.config: use previous debconf settings if
/etc/locales does not exists.
- * patches/any/cvs-eventfd.diff: new patch from upstream to fix
- eventfd2 syscall calling convention.
-- Aurelien Jarno <aurel32@debian.org> Tue, 04 Nov 2008 16:31:04 +0100
Modified: glibc-package/trunk/debian/patches/any/cvs-eventfd.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-eventfd.diff 2008-11-04 15:36:51 UTC (rev 3188)
+++ glibc-package/trunk/debian/patches/any/cvs-eventfd.diff 2008-11-04 16:22:45 UTC (rev 3189)
@@ -1,18 +0,0 @@
-2008-10-02 Pierre Habouzit <madcoder@debian.org>
-
- * sysdeps/unix/sysv/linux/eventfd.c (eventfd): Use the eventfd2 syscall
- and fix its calling convention.
-
---- a/sysdeps/unix/sysv/linux/eventfd.c
-+++ b/sysdeps/unix/sysv/linux/eventfd.c
-@@ -24,8 +24,8 @@
- int
- eventfd (int count, int flags)
- {
--#ifdef __NR_eventfd1
-- return INLINE_SYSCALL (eventfd1, 1, flags);
-+#ifdef __NR_eventfd2
-+ return INLINE_SYSCALL (eventfd2, 2, count, flags);
- #else
- /* The old system call has no flag parameter which is bad. So we have
- to wait until we have to support to pass additional values to the
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2008-11-04 15:36:51 UTC (rev 3188)
+++ glibc-package/trunk/debian/patches/series 2008-11-04 16:22:45 UTC (rev 3189)
@@ -171,7 +171,6 @@
any/cvs-strerror_r.diff
any/cvs-rpcgen-makefile.diff
any/cvs-gai-stacksize.diff
-any/cvs-eventfd.diff
any/local-notls.diff -p0
any/local-asserth-decls.diff -p0
any/local-bashisms.diff -p0
Reply to: