Fix compile errors resulting from upstream Linux merge

Signed-off-by: Sultanxda <sultanxda@gmail.com>