4/4

This also contains a small optimisation on UP machines
where a spinlock is a noop.

-- 
SUSE Labs, Novell Inc.