x86: consolidate spinlock.h