projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
[linux-2.6-block.git]
/
include
/
linux
/
eventpoll.h
diff --git
a/include/linux/eventpoll.h
b/include/linux/eventpoll.h
index 84cfa8bbdc3698fc3a1fdb998d8c606e4d6e9ced..cf79853967ffb25b839e7c77c3bf8ef9956d95e8 100644
(file)
--- a/
include/linux/eventpoll.h
+++ b/
include/linux/eventpoll.h
@@
-31,6
+31,8
@@
/*
* 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
*/
#ifdef __x86_64__
#define EPOLL_PACKED __attribute__((packed))