Fix compile errors resulting from upstream Linux changes

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