| From | Andi Kleen <> | Subject | [PATCH] [65/275] klist: Fix object alignment on 64-bit. | Date | Wed, 30 Mar 2011 14:05:02 -0700 (PDT) |
| |
2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------ 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> Signed-off-by: Andi Kleen <ak@linux.intel.com>
--- include/linux/klist.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Index: linux-2.6.35.y/include/linux/klist.h =================================================================== --- linux-2.6.35.y.orig/include/linux/klist.h 2011-03-29 22:51:43.946598685 -0700 +++ linux-2.6.35.y/include/linux/klist.h 2011-03-29 23:02:59.534312087 -0700 @@ -22,7 +22,7 @@ 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), \
|