Reverted to a spinlock (untested)

will work for x86/amd64 only, sorry