From: <gregkh@suse.de>
To: jdike@addtoit.com, akpm@osdl.org, gregkh@suse.de,
jdike@linux.intel.com,
user-mode-linux-devel@lists.sourceforge.net
Cc: stable@kernel.org
Subject: [uml-devel] patch uml-fix-epoll.patch queued to -stable tree
Date: Fri, 30 Mar 2007 13:17:58 -0700 [thread overview]
Message-ID: <20070330201931.71EE0C9F718@imap.suse.de> (raw)
In-Reply-To: <20070323181817.GA8694@c2.user-mode-linux.org>
This is a note to let you know that we have just queued up the patch titled
Subject: UML - fix epoll
to the 2.6.20-stable tree. Its filename is
uml-fix-epoll.patch
A git repo of this tree can be found at
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
From stable-bounces@linux.kernel.org Fri Mar 23 11:22:17 2007
From: Jeff Dike <jdike@addtoit.com>
Date: Fri, 23 Mar 2007 14:18:17 -0400
Subject: UML - fix epoll
To: Andrew Morton <akpm@osdl.org>, stable@kernel.org
Cc: uml-devel <user-mode-linux-devel@lists.sourceforge.net>
Message-ID: <20070323181817.GA8694@c2.user-mode-linux.org>
Content-Disposition: inline
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>
--- linux-2.6.21-mm.orig/include/linux/eventpoll.h 2007-03-05 13:01:17.000000000 -0500
+++ linux-2.6.21-mm/include/linux/eventpoll.h 2007-03-23 14:03:07.000000000 -0400
@@ -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;
_______________________________________________
stable mailing list
stable@linux.kernel.org
http://linux.kernel.org/mailman/listinfo/stable
Patches currently in stable-queue which might be from jdike@addtoit.com are
-------------------------------------------------------------------------
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
prev parent reply other threads:[~2007-03-30 20:19 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-03-23 18:18 [uml-devel] [PATCH] UML - fix epoll Jeff Dike
2007-03-30 20:17 ` gregkh [this message]
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=20070330201931.71EE0C9F718@imap.suse.de \
--to=gregkh@suse.de \
--cc=akpm@osdl.org \
--cc=jdike@addtoit.com \
--cc=jdike@linux.intel.com \
--cc=stable@kernel.org \
--cc=user-mode-linux-devel@lists.sourceforge.net \
/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