Revert unintentional "volatile" changes in ipc/msg.c

Commit 5a06a363ef48444186f18095ae1b932dddbbfa89 ("[PATCH] ipc/msg.c:
clean up coding style") breaks fakeroot on Alpha (variously hangs or
oopses), according to a report by Falk Hueffner.

The fact that the code seems to rely on compiler access ordering through
the use of "volatile" is a pretty certain sign that the code has locking
problems, and we should fix those properly and then remove the whole
"volatile" entirely.

But in the meantime, the movement of "volatile" was unintentional, and
should be reverted.

Cc: Falk Hueffner <falk@debian.org>
Cc: Andrew Morton <akpm@osdl.org>
Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/ipc/msg.c b/ipc/msg.c
index 600e06f943a67eb5539d372d945009ae0b1d3e36..1266b1d0c8e33d47f25e46a692b53afd5186d5e6 100644 (file)
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -52,7 +52,7 @@ struct msg_receiver {
        long                    r_msgtype;
        long                    r_maxsize;
 
-       volatile struct msg_msg *r_msg;
+       struct msg_msg          *volatile r_msg;
 };
 
 /* one msg_sender for each sleeping sender */