Skip to content

Commit 3ec3f5f

Browse files
committed
Merge tag 'livepatching-for-6.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching
Pull livepatching fix from Petr Mladek: "Selftest regression fix" * tag 'livepatching-for-6.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching: selftests/livepatch: wait for atomic replace to occur
2 parents 4159466 + 052f395 commit 3ec3f5f

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

tools/testing/selftests/livepatch/test-livepatch.sh

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,8 @@ load_lp $MOD_REPLACE replace=1
139139
grep 'live patched' /proc/cmdline > /dev/kmsg
140140
grep 'live patched' /proc/meminfo > /dev/kmsg
141141

142-
mods=(/sys/kernel/livepatch/*)
143-
nmods=${#mods[@]}
144-
if [ "$nmods" -ne 1 ]; then
145-
die "Expecting only one moduled listed, found $nmods"
146-
fi
142+
loop_until 'mods=(/sys/kernel/livepatch/*); nmods=${#mods[@]}; [[ "$nmods" -eq 1 ]]' ||
143+
die "Expecting only one moduled listed, found $nmods"
147144

148145
# These modules were disabled by the atomic replace
149146
for mod in $MOD_LIVEPATCH3 $MOD_LIVEPATCH2 $MOD_LIVEPATCH1; do

0 commit comments

Comments
 (0)