git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
linux
/
eventpoll.h
diff --git
a/include/linux/eventpoll.h
b/include/linux/eventpoll.h
index
1289f0e
..
d2a96cb
100644
(file)
--- a/
include/linux/eventpoll.h
+++ b/
include/linux/eventpoll.h
@@
-1,6
+1,6
@@
/*
* include/linux/eventpoll.h ( Efficent event polling implementation )
/*
* include/linux/eventpoll.h ( Efficent event polling implementation )
- * Copyright (C) 2001,...,200
3
Davide Libenzi
+ * Copyright (C) 2001,...,200
6
Davide Libenzi
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-31,12
+31,19
@@
/*
* On x86-64 make the 64bit structure have the same alignment as the
* 32bit structure. This makes 32bit emulation easier.
/*
* On x86-64 make the 64bit structure have the same alignment as the
* 32bit structure. This makes 32bit emulation easier.
+ *
+ * UML/x86_64 needs the same packing as x86_64 - UML + UML_X86 +
+ * 64_BIT adds up to UML/x86_64.
*/
#ifdef __x86_64__
#define EPOLL_PACKED __attribute__((packed))
#else
*/
#ifdef __x86_64__
#define EPOLL_PACKED __attribute__((packed))
#else
+#if defined(CONFIG_UML) && defined(CONFIG_UML_X86) && defined(CONFIG_64BIT)
+#define EPOLL_PACKED __attribute__((packed))
+#else
#define EPOLL_PACKED
#endif
#define EPOLL_PACKED
#endif
+#endif
struct epoll_event {
__u32 events;
struct epoll_event {
__u32 events;
@@
-52,7
+59,12
@@
struct file;
#ifdef CONFIG_EPOLL
/* Used to initialize the epoll bits inside the "struct file" */
#ifdef CONFIG_EPOLL
/* Used to initialize the epoll bits inside the "struct file" */
-void eventpoll_init_file(struct file *file);
+static inline void eventpoll_init_file(struct file *file)
+{
+ INIT_LIST_HEAD(&file->f_ep_links);
+ spin_lock_init(&file->f_ep_lock);
+}
+
/* Used to release the epoll bits inside the "struct file" */
void eventpoll_release_file(struct file *file);
/* Used to release the epoll bits inside the "struct file" */
void eventpoll_release_file(struct file *file);
@@
-85,7
+97,6
@@
static inline void eventpoll_release(struct file *file)
eventpoll_release_file(file);
}
eventpoll_release_file(file);
}
-
#else
static inline void eventpoll_init_file(struct file *file) {}
#else
static inline void eventpoll_init_file(struct file *file) {}