asm/smplock.h is dead, you're the only three arches that still have it. Can you delete next time you merge? Thanks. $ find -type f |xargs grep smplock.h ./arch/mips/sibyte/sb1250/bcm1250_tbprof.c:#include <asm/smplock.h> ./include/asm-h8300/smplock.h: * <asm/smplock.h> ./include/asm-um/smplock.h:#include "asm/arch/smplock.h" $ find -name smplock.h ./include/asm-h8300/smplock.h ./include/asm-mips/smplock.h ./include/asm-um/smplock.h (the sibyte driver can just lose this line. it doesn't do any SMP locking) -- "It's not Hollywood. War is real, war is primarily not about defeat or victory, it is about death. I've seen thousands and thousands of dead bodies. Do you think I want to have an academic debate on this subject?" -- Robert Fisk