diff options
| author |   David Miller <davem@davemloft.net> | 2011-02-13 16:37:07 -0800 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-13 16:54:24 -0800 |
| commit | 795abaf1e4e188c4171e3cd3dbb11a9fcacaf505 (patch) | |
| tree | ae7273f0234c3fc3847626266080d8cfdb072c52 /include | |
| parent | Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6 (diff) | |
| download | linux-dev-795abaf1e4e188c4171e3cd3dbb11a9fcacaf505.tar.xz linux-dev-795abaf1e4e188c4171e3cd3dbb11a9fcacaf505.zip | |
klist: Fix object alignment on 64-bit.
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>
Cc: stable <stable@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
| -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), \ |