diff --git a/[refs] b/[refs] index e443db465085..ccd249fdb27e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 55a981027fc393c86de2c4e7836c9515088a9a58 +refs/heads/master: e977145aeaad23d443686f2a2d5b32800d1607c5 diff --git a/trunk/include/linux/rbtree.h b/trunk/include/linux/rbtree.h index 748be50329d8..3cc30b0ab828 100644 --- a/trunk/include/linux/rbtree.h +++ b/trunk/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 {