mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-29 18:11:20 +00:00
[PATCH] uml: fix epoll
UML/x86_64 needs the same packing of struct epoll_event as x86_64. Signed-off-by: Jeff Dike <jdike@linux.intel.com> Cc: Davide Libenzi <davidel@xmailserver.org> Cc: <stable@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
3899210ad9
commit
d75e26a829
1 changed files with 7 additions and 0 deletions
|
@ -31,12 +31,19 @@
|
||||||
/*
|
/*
|
||||||
* On x86-64 make the 64bit structure have the same alignment as the
|
* On x86-64 make the 64bit structure have the same alignment as the
|
||||||
* 32bit structure. This makes 32bit emulation easier.
|
* 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__
|
#ifdef __x86_64__
|
||||||
#define EPOLL_PACKED __attribute__((packed))
|
#define EPOLL_PACKED __attribute__((packed))
|
||||||
#else
|
#else
|
||||||
|
#if defined(CONFIG_UML) && defined(CONFIG_UML_X86) && defined(CONFIG_64BIT)
|
||||||
|
#define EPOLL_PACKED __attribute__((packed))
|
||||||
|
#else
|
||||||
#define EPOLL_PACKED
|
#define EPOLL_PACKED
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
struct epoll_event {
|
struct epoll_event {
|
||||||
__u32 events;
|
__u32 events;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue