Merge Linux 3.5 epoll changes

Add EPOLLWAKEUP.
This commit is contained in:
Andreas Jaeger 2012-07-26 13:11:33 +02:00
parent bfc07087bf
commit f8d44fdc72
3 changed files with 10 additions and 1 deletions

View File

@ -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...

View File

@ -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

View File

@ -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