diff --git a/patch/kselftest-qemu.patch b/patch/kselftest-qemu.patch
index 08e96c3..161ce28 100644
--- a/patch/kselftest-qemu.patch
+++ b/patch/kselftest-qemu.patch
@@ -1,15 +1,3 @@
-From fa55e4b82501edef90155c640cdb2f13355f4b35 Mon Sep 17 00:00:00 2001
-From: Yafen Fang <yafen@iscas.ac.cn>
-Date: Fri, 22 Aug 2025 18:06:36 +0800
-Subject: [PATCH] kselftest qemu
-
----
- .../ftrace/test.d/kprobe/multiple_kprobes.tc  |  8 +-
- tools/testing/selftests/hid/Makefile          | 10 +--
- tools/testing/selftests/hid/progs/hid.c       |  3 -
- .../selftests/hid/progs/hid_bpf_helpers.h     | 77 +++++++++++++++++++
- 4 files changed, 85 insertions(+), 13 deletions(-)
-
 diff --git a/tools/testing/selftests/ftrace/test.d/kprobe/multiple_kprobes.tc b/tools/testing/selftests/ftrace/test.d/kprobe/multiple_kprobes.tc
 index be754f5bcf79..278cce20c7a6 100644
 --- a/tools/testing/selftests/ftrace/test.d/kprobe/multiple_kprobes.tc
@@ -178,6 +166,41 @@ index 4fff31dbe0e7..65e657ac1198 100644
  /* following are kfuncs exported by HID for HID-BPF */
  extern __u8 *hid_bpf_get_data(struct hid_bpf_ctx *ctx,
  			      unsigned int offset,
--- 
-2.34.1
-
+diff --git a/tools/testing/selftests/memfd/run_fuse_test.sh b/tools/testing/selftests/memfd/run_fuse_test.sh
+index 22e572e2d66a..f666635c106f 100755
+--- a/tools/testing/selftests/memfd/run_fuse_test.sh
++++ b/tools/testing/selftests/memfd/run_fuse_test.sh
+@@ -1,10 +1,16 @@
+ #!/bin/sh
+ # SPDX-License-Identifier: GPL-2.0
+ 
+-if test -d "./mnt" ; then
+-	fusermount -u ./mnt
+-	rmdir ./mnt
+-fi
++trap 'umount_mnt' EXIT
++
++umount_mnt(){
++	if test -d "./mnt" ; then
++		fusermount -u ./mnt
++		rmdir ./mnt
++	fi
++}
++
++umount_mnt
+ 
+ set -e
+ 
+diff --git a/tools/testing/selftests/memfd/run_hugetlbfs_test.sh b/tools/testing/selftests/memfd/run_hugetlbfs_test.sh
+index fb633eeb0290..962928cce94b 100755
+--- a/tools/testing/selftests/memfd/run_hugetlbfs_test.sh
++++ b/tools/testing/selftests/memfd/run_hugetlbfs_test.sh
+@@ -44,7 +44,7 @@ fi
+ # If still not enough huge pages available, exit.  But, give back any huge
+ # pages potentially allocated above.
+ #
+-if [ $freepgs -lt $hpages_test ]; then
++if [ -n "$freepgs" ] && [ $freepgs -lt $hpages_test ]; then
+ 	# nr_hugepgs non-zero only if we attempted to increase
+ 	if [ -n "$nr_hugepgs" ]; then
+ 		echo $nr_hugepgs > /proc/sys/vm/nr_hugepages