aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/rbtree.h
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2006-04-21 23:15:39 +0100
committerDavid Woodhouse <dwmw2@infradead.org>2006-04-21 23:15:39 +0100
commite977145aeaad23d443686f2a2d5b32800d1607c5 (patch)
tree99b066ca9933aef27778b62e3f783d55592ba9e2 /include/linux/rbtree.h
parent[RBTREE] Merge colour and parent fields of struct rb_node. (diff)
downloadlinux-dev-e977145aeaad23d443686f2a2d5b32800d1607c5.tar.xz
linux-dev-e977145aeaad23d443686f2a2d5b32800d1607c5.zip
[RBTREE] Add explicit alignment to sizeof(long) for struct rb_node.
Seems like a strange requirement, but allegedly it was necessary for struct address_space on CRIS, because it otherwise ended up being only byte-aligned. It's harmless enough, and easier to just do it than to prove it isn't necessary... although I really ought to dig out my etrax board and test it some time. Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'include/linux/rbtree.h')
-rw-r--r--include/linux/rbtree.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/rbtree.h b/include/linux/rbtree.h
index 748be50329d8..3cc30b0ab828 100644
--- a/include/linux/rbtree.h
+++ b/include/linux/rbtree.h
@@ -104,7 +104,8 @@ struct rb_node
#define RB_BLACK 1
struct rb_node *rb_right;
struct rb_node *rb_left;
-};
+} __attribute__((aligned(sizeof(long))));
+ /* The alignment might seem pointless, but allegedly CRIS needs it */
struct rb_root
{