From: David Woodhouse <dwmw2@infradead.org>
Date: Fri, 21 Apr 2006 22:15:39 +0000 (+0100)
Subject: [RBTREE] Add explicit alignment to sizeof(long) for struct rb_node.
X-Git-Tag: v2.6.18-rc1~1104^2~3
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e977145aeaad23d443686f2a2d5b32800d1607c5;p=linux-2.6

[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>
---

diff --git a/include/linux/rbtree.h b/include/linux/rbtree.h
index 748be50329..3cc30b0ab8 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
 {