Hi Guanyou & lianbo,

I re-thought about the patch, and I agree the revert patch should be
applied, the reverted code is already covered by the previous:

if (THIS_KERNEL_VERSION >= LINUX(5,12,0)) {
...
else
...

hunk, so there is no need for the
CONFIG_ARM64_4K_PAGES/CONFIG_ARM64_16K_PAGES checks here. Previously
the patch was applied for the compatibility of android kernel due to
its customization, mainline kernel won't need this.

What do you think? @Lianbo Jiang