Fixed few compilation errors for latest kernel#3

pkumarg wants to merge 1 commit intojesstess:masterjesstess/ldd4:masterfrom

pkumarg:masterpkumarg/ldd4:masterCopy head branch name to clipboard