Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 795abaf1 authored by David Miller's avatar David Miller Committed by Linus Torvalds
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
Acked-by: default avatarJesper Nilsson <jesper.nilsson@axis.com>
Cc: stable <stable@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 091994cf

include/linux/klist.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -22,7 +22,7 @@ struct klist { 
	struct list_head	k_list;

	struct list_head	k_list;

	void			(*get)(struct klist_node *);

	void			(*get)(struct klist_node *);

	void			(*put)(struct klist_node *);

	void			(*put)(struct klist_node *);

} __attribute__ ((aligned (4)));

} __attribute__ ((aligned (sizeof(void *))));





#define KLIST_INIT(_name, _get, _put)					\

#define KLIST_INIT(_name, _get, _put)					\

	{ .k_lock	= __SPIN_LOCK_UNLOCKED(_name.k_lock),		\

	{ .k_lock	= __SPIN_LOCK_UNLOCKED(_name.k_lock),		\