diff options
author | David Miller <davem@davemloft.net> | 2011-02-13 16:37:07 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-17 15:14:39 -0800 |
commit | cea229ad1aebf290feea057734a90b4a9b329ea8 (patch) | |
tree | e7198b322aed0994caad67873eae7e79ff531660 | |
parent | 39a06a2ac3bcb57fc04ffb53af8e402e96c515f4 (diff) | |
download | linux-stable-cea229ad1aebf290feea057734a90b4a9b329ea8.tar.gz linux-stable-cea229ad1aebf290feea057734a90b4a9b329ea8.tar.bz2 linux-stable-cea229ad1aebf290feea057734a90b4a9b329ea8.zip |
klist: Fix object alignment on 64-bit.
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>
-rw-r--r-- | include/linux/klist.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/klist.h b/include/linux/klist.h index e91a4e59b771..a370ce57cf1d 100644 --- 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), \ |