From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, stable@kernel.org,
Andrew Morton <akpm@osdl.org>
Cc: Theodore Ts'o <tytso@mit.edu>,
Zwane Mwaikambo <zwane@arm.linux.org.uk>,
uml-devel <user-mode-linux-devel@lists.sourceforge.net>,
Justin Forbes <jmforbes@linuxtx.org>,
Chris Wedgwood <reviews@ml.cw.f00f.org>,
Randy Dunlap <rdunlap@xenotime.net>,
Michael Krufky <mkrufky@linuxtv.org>,
Chuck Ebbert <cebbert@redhat.com>, Dave Jones <davej@redhat.com>,
Chuck Wolber <chuckw@quantumlinux.com>,
akpm@linux-foundation.org, Jeff Dike <jdike@linux.intel.com>,
torvalds@linux-foundation.org, alan@lxorguk.ukuu.org.uk
Subject: [uml-devel] [patch 04/37] UML - fix epoll
Date: Fri, 30 Mar 2007 14:04:01 -0700 [thread overview]
Message-ID: <20070330210401.GE29450@kroah.com> (raw)
In-Reply-To: <20070330210334.GA29450@kroah.com>
[-- Attachment #1: uml-fix-epoll.patch --]
[-- Type: text/plain, Size: 1529 bytes --]
-stable review patch. If anyone has any objections, please let us know.
------------------
From: Jeff Dike <jdike@addtoit.com>
UML/x86_64 needs the same packing of struct epoll_event as x86_64.
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
include/linux/eventpoll.h | 7 +++++++
1 file changed, 7 insertions(+)
--- a/include/linux/eventpoll.h
+++ b/include/linux/eventpoll.h
@@ -31,12 +31,19 @@
/*
* 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
+#if defined(CONFIG_UML) && defined(CONFIG_UML_X86) && defined(CONFIG_64BIT)
+#define EPOLL_PACKED __attribute__((packed))
+#else
#define EPOLL_PACKED
#endif
+#endif
struct epoll_event {
__u32 events;
--
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
next parent reply other threads:[~2007-03-30 21:10 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20070330205938.984247529@mini.kroah.org>
[not found] ` <20070330210334.GA29450@kroah.com>
2007-03-30 21:04 ` Greg KH [this message]
2007-03-30 21:04 ` [uml-devel] [patch 05/37] UML - host VDSO fix Greg KH
2007-03-30 21:04 ` [uml-devel] [patch 06/37] UML - Fix static linking Greg KH
2007-03-30 21:04 ` Greg KH
2007-03-31 1:21 ` Blaisorblade
2007-03-30 21:04 ` [uml-devel] [patch 07/37] UML - use correct register file size everywhere Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070330210401.GE29450@kroah.com \
--to=gregkh@suse.de \
--cc=akpm@linux-foundation.org \
--cc=akpm@osdl.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=cebbert@redhat.com \
--cc=chuckw@quantumlinux.com \
--cc=davej@redhat.com \
--cc=jdike@linux.intel.com \
--cc=jmforbes@linuxtx.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mkrufky@linuxtv.org \
--cc=rdunlap@xenotime.net \
--cc=reviews@ml.cw.f00f.org \
--cc=stable@kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=tytso@mit.edu \
--cc=user-mode-linux-devel@lists.sourceforge.net \
--cc=zwane@arm.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox