o Cleanup lock definitions
 o Fix config.h use
 o Update defconfig
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>