kernel: fix compilation errors from merge derp

Change-Id: Iae8ea792a0b95c97b96084a91c8b1eddfe4c66a3