Backport 2 commits to fix build on 4.19: 3ea761a1ed 2b76b68c65 Signed-off-by: Deng Qingfang <dengqf6@mail2.sysu.edu.cn>
3ea761a1ed
2b76b68c65