stable inclusion
from stable-v5.10.134
commit b07240ce4a09d9771d544e15a3a4ec008cc186ad
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5ZVR7

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=b07240ce4a09d9771d544e15a3a4ec008cc186ad

--------------------------------

This reverts commit 87ae522e467e17a13b796e2cb595f9c3943e4d5e which is
commit db87db65 upstream.

It is not needed in 5.10.y and causes problems.

Link: https://lore.kernel.org/r/CAK8P3a0vZrXxNp3YhrxFjFunHgxSZBKD9Y4darSODgeFAukCeQ@mail.gmail.comReported-by: Nkernel test robot <lkp@intel.com>
Reported-by: NArnd Bergmann <arnd@arndb.de>
Cc: Greg Ungerer <gerg@linux-m68k.org>
Cc: Sasha Levin <sashal@kernel.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
Reviewed-by: NWei Li <liwei391@huawei.com>