Removing NO_IPI ifdef for memory barrier. The smp_wmb should be used all the time...

[ust.git] / libust / buffers.h

diff --git a/libust/buffers.h b/libust/buffers.h
index 00655a49cb394838ae3e323f9ca69d6a1673476d..4fa6262af1715da97ebd69afecfa4084d61566dd 100644 (file)
--- a/libust/buffers.h
+++ b/libust/buffers.h
@@ -369,7 +369,7 @@ static __inline__ int ltt_reserve_slot(struct ust_channel *chan,
        /*
         * Perform retryable operations.
         */
-       /* FIXME: make this rellay per cpu? */
+       /* FIXME: make this really per cpu? */
        if (unlikely(LOAD_SHARED(ltt_nesting) > 4)) {
                DBG("Dropping event because nesting is too deep.");
                uatomic_inc(&buf->events_lost);
@@ -483,16 +483,8 @@ static __inline__ void ltt_commit_slot(
        long endidx = SUBBUF_INDEX(offset_end - 1, chan);
        long commit_count;
 
-#ifdef LTT_NO_IPI_BARRIER
        smp_wmb();
-#else
-       /*
-        * Must write slot data before incrementing commit count.
-        * This compiler barrier is upgraded into a smp_mb() by the IPI
-        * sent by get_subbuf().
-        */
-       barrier();
-#endif
+
        uatomic_add(&buf->commit_count[endidx].cc, slot_size);
        /*
         * commit count read can race with concurrent OOO commit count updates.