[PATCH] Make spinlock/rwlock annotations more accurate by using parameters, not types