fix error from previous cherry-picks

Conflicts:
	kernel/sys.c