From: Greg Kroah-Hartman Date: Tue, 15 Feb 2011 15:01:30 +0000 (-0800) Subject: .36 patches X-Git-Tag: v2.6.36.4~30 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e9e50eb407b843a5e8d851a01d0ab69f0bdc6e83;p=thirdparty%2Fkernel%2Fstable-queue.git .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 index 00000000000..ba5b5f31f1a --- /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 +Date: Sun, 13 Feb 2011 16:37:07 -0800 +Subject: klist: Fix object alignment on 64-bit. + +From: David Miller + +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 +Acked-by: Jesper Nilsson +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + 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 f5028c681bf..8ae06a3baab 100644 --- 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