diff options
| author | Andreas Jaeger <aj@suse.de> | 2012-07-26 13:11:33 +0200 |
|---|---|---|
| committer | Andreas Jaeger <aj@suse.de> | 2012-07-26 13:11:33 +0200 |
| commit | f8d44fdc72253347dae69fd2c4a231efba4fec98 (patch) | |
| tree | 70c6c38160ddf8c11d1bca0ebf7566effb78a383 | |
| parent | bfc07087bf30879023acb498d8b17b4b0affb4e3 (diff) | |
| download | glibc-f8d44fdc72253347dae69fd2c4a231efba4fec98.tar glibc-f8d44fdc72253347dae69fd2c4a231efba4fec98.tar.gz glibc-f8d44fdc72253347dae69fd2c4a231efba4fec98.tar.bz2 glibc-f8d44fdc72253347dae69fd2c4a231efba4fec98.zip | |
Merge Linux 3.5 epoll changes
Add EPOLLWAKEUP.
| -rw-r--r-- | ports/ChangeLog.hppa | 5 | ||||
| -rw-r--r-- | ports/sysdeps/unix/sysv/linux/hppa/sys/epoll.h | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sys/epoll.h | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/ports/ChangeLog.hppa b/ports/ChangeLog.hppa index e588a7853f..83d298fe4a 100644 --- a/ports/ChangeLog.hppa +++ b/ports/ChangeLog.hppa @@ -1,3 +1,8 @@ +2012-07-26 Andreas Jaeger <aj@suse.de> + + * sysdeps/unix/sysv/linux/hppa/sys/epoll.h (EPOLLWAKEUP): Add new + value. + 2012-05-19 Carlos O'Donell <carlos@systemhalted.org> * sysdeps/hppa/add_n.s: Rename this... diff --git a/ports/sysdeps/unix/sysv/linux/hppa/sys/epoll.h b/ports/sysdeps/unix/sysv/linux/hppa/sys/epoll.h index 0adf09029e..e06d5668f7 100644 --- a/ports/sysdeps/unix/sysv/linux/hppa/sys/epoll.h +++ b/ports/sysdeps/unix/sysv/linux/hppa/sys/epoll.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2002-2009, 2012 Free Software Foundation, Inc. +/* Copyright (C) 2002-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -64,6 +64,8 @@ enum EPOLL_EVENTS #define EPOLLHUP EPOLLHUP EPOLLRDHUP = 0x2000, #define EPOLLRDHUP EPOLLRDHUP + EPOLLWAKEUP = 1u << 29, +#define EPOLLWAKEUP EPOLLWAKEUP EPOLLONESHOT = 1u << 30, #define EPOLLONESHOT EPOLLONESHOT EPOLLET = 1u << 31 diff --git a/sysdeps/unix/sysv/linux/sys/epoll.h b/sysdeps/unix/sysv/linux/sys/epoll.h index a55ebad622..6c2f10aab9 100644 --- a/sysdeps/unix/sysv/linux/sys/epoll.h +++ b/sysdeps/unix/sysv/linux/sys/epoll.h @@ -61,6 +61,8 @@ enum EPOLL_EVENTS #define EPOLLHUP EPOLLHUP EPOLLRDHUP = 0x2000, #define EPOLLRDHUP EPOLLRDHUP + EPOLLWAKEUP = 1u << 29, +#define EPOLLWAKEUP EPOLLWAKEUP EPOLLONESHOT = 1u << 30, #define EPOLLONESHOT EPOLLONESHOT EPOLLET = 1u << 31 |