diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-08-28 06:34:08 +1200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-08-28 06:34:08 +1200 |
| commit | 3ec3f5fc4a91e389ea56b111a73d97ffc94f19c6 (patch) | |
| tree | 034b4e116b70a68b7f986fa3a4ab58dfd124fb4c /tools | |
| parent | 41594663c3fb565940ec2b947bd7e623e3f0e600 (diff) | |
| parent | 052f3951640fd96d2e777b3272a925ec6c0c8100 (diff) | |
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
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/testing/selftests/livepatch/test-livepatch.sh | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tools/testing/selftests/livepatch/test-livepatch.sh b/tools/testing/selftests/livepatch/test-livepatch.sh index 65c9c058458d..bd13257bfdfe 100755 --- a/tools/testing/selftests/livepatch/test-livepatch.sh +++ b/tools/testing/selftests/livepatch/test-livepatch.sh @@ -139,11 +139,8 @@ load_lp $MOD_REPLACE replace=1 grep 'live patched' /proc/cmdline > /dev/kmsg grep 'live patched' /proc/meminfo > /dev/kmsg -mods=(/sys/kernel/livepatch/*) -nmods=${#mods[@]} -if [ "$nmods" -ne 1 ]; then - die "Expecting only one moduled listed, found $nmods" -fi +loop_until 'mods=(/sys/kernel/livepatch/*); nmods=${#mods[@]}; [[ "$nmods" -eq 1 ]]' || + die "Expecting only one moduled listed, found $nmods" # These modules were disabled by the atomic replace for mod in $MOD_LIVEPATCH3 $MOD_LIVEPATCH2 $MOD_LIVEPATCH1; do |