.36 patches

diff --git a/queue-2.6.36/klist-fix-object-alignment-on-64-bit.patch b/queue-2.6.36/klist-fix-object-alignment-on-64-bit.patch
new file mode 100644 (file)
index 0000000..ba5b5f3
--- /dev/null
+++ b/queue-2.6.36/klist-fix-object-alignment-on-64-bit.patch
@@ -0,0 +1,35 @@
+From 795abaf1e4e188c4171e3cd3dbb11a9fcacaf505 Mon Sep 17 00:00:00 2001
+From: David Miller <davem@davemloft.net>
+Date: Sun, 13 Feb 2011 16:37:07 -0800
+Subject: klist: Fix object alignment on 64-bit.
+
+From: David Miller <davem@davemloft.net>
+
+commit 795abaf1e4e188c4171e3cd3dbb11a9fcacaf505 upstream.
+
+Commit c0e69a5bbc6f ("klist.c: bit 0 in pointer can't be used as flag")
+intended to make sure that all klist objects were at least pointer size
+aligned, but used the constant "4" which only works on 32-bit.
+
+Use "sizeof(void *)" which is correct in all cases.
+
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Acked-by: Jesper Nilsson <jesper.nilsson@axis.com>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ include/linux/klist.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/include/linux/klist.h
++++ b/include/linux/klist.h
+@@ -22,7 +22,7 @@ struct klist {
+       struct list_head        k_list;
+       void                    (*get)(struct klist_node *);
+       void                    (*put)(struct klist_node *);
+-} __attribute__ ((aligned (4)));
++} __attribute__ ((aligned (sizeof(void *))));
+ 
+ #define KLIST_INIT(_name, _get, _put)                                 \
+       { .k_lock       = __SPIN_LOCK_UNLOCKED(_name.k_lock),           \

diff --git a/queue-2.6.36/series b/queue-2.6.36/series
index f5028c681bf9cd568661c8296a303eb796b60d39..8ae06a3baab39d1382c5ac255a327fd759e26997 100644 (file)
--- a/queue-2.6.36/series
+++ b/queue-2.6.36/series
@@ -121,3 +121,4 @@ arm-initrd-disable-initrd-if-passed-address-overlaps-reserved-region.patch
 memcg-fix-account-leak-at-failure-of-memsw-acconting.patch
 mmc-bfin_sdh-fix-alloc-size-for-private-data.patch
 mm-page-allocator-adjust-the-per-cpu-counter-threshold-when-memory-is-low.patch
+klist-fix-object-alignment-on-64-bit.patch