From: Lukas Bulwahn <lukas.bulwahn@gmail.com>
To: Michel Lespinasse <michel@lespinasse.org>,
Davidlohr Bueso <dbueso@suse.de>,
Andrew Morton <akpm@linux-foundation.org>,
Mete Polat <metepolat2000@gmail.com>
Cc: Jesper Nilsson <jesper@jni.nu>, Arnd Bergmann <arnd@arndb.de>,
David Woodhouse <dwmw2@infradead.org>,
Ingo Molnar <mingo@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Randy Dunlap <rdunlap@infradead.org>,
kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org,
Lukas Bulwahn <lukas.bulwahn@gmail.com>
Subject: [PATCH] rbtree: remove unneeded explicit alignment in struct rb_node
Date: Thu, 5 Aug 2021 15:32:13 +0200 [thread overview]
Message-ID: <20210805133213.700-1-lukas.bulwahn@gmail.com> (raw)
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@infradead.org>
Reported-by: Mete Polat <metepolat2000@gmail.com>
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
---
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
next reply other threads:[~2021-08-05 13:32 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-05 13:32 Lukas Bulwahn [this message]
2021-08-05 14:02 ` [PATCH] rbtree: remove unneeded explicit alignment in struct rb_node Arnd Bergmann
2021-08-05 14:14 ` Lukas Bulwahn
2021-08-05 15:02 ` Davidlohr Bueso
2021-08-05 15:10 ` Peter Zijlstra
2021-08-05 17:20 ` Mete Polat
2021-08-06 8:52 ` Michel Lespinasse
2021-08-06 11:57 ` Peter Zijlstra
2021-08-10 22:46 ` Jesper Nilsson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210805133213.700-1-lukas.bulwahn@gmail.com \
--to=lukas.bulwahn@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=dbueso@suse.de \
--cc=dwmw2@infradead.org \
--cc=jesper@jni.nu \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=metepolat2000@gmail.com \
--cc=michel@lespinasse.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=rdunlap@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).