2.6.25-rc6-git8

 fs

diff --git a/fs/aio.c b/fs/aio.c
index b74c567..6af9219 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -996,6 +996,14 @@ put_rq:
    /* everything turned out well, dispose of the aiocb. */
    ret = __aio_put_req(ctx, iocb);
 
+   /*
+    * We have to order our ring_info tail store above and test
+    * of the wait list below outside the wait lock.  This is
+    * like in wake_up_bit() where clearing a bit has to be
+    * ordered with the unlocked test.
+    */
+   smp_mb();
+
    if (waitqueue_active(&ctx->wait))
       wake_up(&ctx->wait);