diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-15 07:02:00 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-15 07:02:00 -0800 |
| commit | 6d798e20a76d756fb653fc8d5e9e11bf53e21766 (patch) | |
| tree | 140d5de890c0bf44509c25edc5c4fb4137f32c83 | |
| parent | ebf64a445631220c43aec878768aeefc59cd723d (diff) | |
| download | longterm-queue-2.6.33-6d798e20a76d756fb653fc8d5e9e11bf53e21766.tar.gz | |
.33 patch
| -rw-r--r-- | queue-2.6.33/klist-fix-object-alignment-on-64-bit.patch | 35 | ||||
| -rw-r--r-- | queue-2.6.33/series | 1 |
2 files changed, 36 insertions, 0 deletions
diff --git a/queue-2.6.33/klist-fix-object-alignment-on-64-bit.patch b/queue-2.6.33/klist-fix-object-alignment-on-64-bit.patch new file mode 100644 index 0000000..ba5b5f3 --- /dev/null +++ b/queue-2.6.33/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.33/series b/queue-2.6.33/series index fc98fc4..d2e22a2 100644 --- a/queue-2.6.33/series +++ b/queue-2.6.33/series @@ -306,3 +306,4 @@ x86-mtrr-avoid-mtrr-reprogramming-on-bp-during-boot-on-up-platforms.patch fix-jiffy-calculations-in-calibrate_delay_direct-to-handle-overflow.patch usb-serial-pl2303-hybrid-reader-uniform-hcr331.patch drivers-update-to-pl2303-usb-serial-to-support-motorola-cables.patch +klist-fix-object-alignment-on-64-bit.patch |