lockdep fixes

These fixes make lockdep work in sony kernels.