summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-05-12 11:06:26 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-05-12 11:06:26 -0700
commit24085f70a6e1b0cb647ec92623284641d8270637 (patch)
tree31afb374f039c28b297bad5fbb41c1e8f7ea55f5 /tools
parent8ec91c0fce1500306a858d0c35d1383fd9eb6ba6 (diff)
parent611d0a95d46b0977a530b4d538948c69d447b001 (diff)
downloadlwn-24085f70a6e1b0cb647ec92623284641d8270637.tar.gz
lwn-24085f70a6e1b0cb647ec92623284641d8270637.zip
Merge tag 'trace-v5.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing fixes from Steven Rostedt: "Fixes to previous fixes. Unfortunately, the last set of fixes introduced some minor bugs: - The bootconfig apply_xbc() leak fix caused the application to return a positive number on success, when it should have returned zero. - The preempt_irq_delay_thread fix to make the creation code wait for the kthread to finish to prevent it from executing after module unload, can now cause the kthread to exit before it even executes (preventing it to run its tests). - The fix to the bootconfig that fixed the initrd to remove the bootconfig from causing the kernel to panic, now prints a warning that the bootconfig is not found, even when bootconfig is not on the command line" * tag 'trace-v5.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: bootconfig: Fix to prevent warning message if no bootconfig option tracing: Wait for preempt irq delay thread to execute tools/bootconfig: Fix apply_xbc() to return zero on success
Diffstat (limited to 'tools')
-rw-r--r--tools/bootconfig/main.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/bootconfig/main.c b/tools/bootconfig/main.c
index 001076c51712..0efaf45f7367 100644
--- a/tools/bootconfig/main.c
+++ b/tools/bootconfig/main.c
@@ -337,6 +337,7 @@ int apply_xbc(const char *path, const char *xbc_path)
pr_err("Failed to apply a boot config magic: %d\n", ret);
goto out;
}
+ ret = 0;
out:
close(fd);
free(data);