... by the way, why are you touching only those two headers? Didn't we agree to change consistently all the occurrences of __exchange_and_add_dispatch(..., -1)? Paolo.