Commit 795abaf1 authored Feb 13, 2011 by David Miller Committed by Linus Torvalds Feb 13, 2011

klist: Fix object alignment on 64-bit.



Commit c0e69a5b ("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>
Cc: stable <stable@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 091994cf

include/linux/klist.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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), \

Admin message