Commit e977145aeaad ("[RBTREE] Add explicit alignment to sizeof(long) for
struct rb_node.") adds an explicit alignment to the struct rb_node due to
some speciality of the CRIS architecture.
The support for the CRIS architecture was removed with commit c690eddc2f3b
("CRIS: Drop support for the CRIS port")
So, remove this now unneeded explicit alignment in struct rb_node as well.
This basically reverts commit e977145aeaad ("[RBTREE] Add explicit
alignment to sizeof(long) for struct rb_node.").
Reported-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
Reported-by: Mete Polat <metepolat2000@xxxxxxxxx>
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@xxxxxxxxx>
---
applies cleanly on next-20210804, but only x86 compile-checked.
Michel, Davidlohr, Jesper, David, please ack.
Mete, you might want to re-run your RBT test suite for this change.
Andrew, once acked, please pick this minor cleanup into your tree.
include/linux/rbtree.h | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/include/linux/rbtree.h b/include/linux/rbtree.h
index d31ecaf4fdd3..e9390be1ba67 100644
--- a/include/linux/rbtree.h
+++ b/include/linux/rbtree.h
@@ -25,8 +25,7 @@ struct rb_node {
unsigned long __rb_parent_color;
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 {
struct rb_node *rb_node;
--
2.17.1
