aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorGravatar Linus Torvalds <torvalds@linux-foundation.org> 2022-12-21 19:03:42 -0800
committerGravatar Linus Torvalds <torvalds@linux-foundation.org> 2022-12-21 19:03:42 -0800
commit9d2f6060fe4c3b49d0cdc1dce1c99296f33379c8 (patch)
treec52592759a0b3bcfeaf354bcd013da50998bd85c /kernel
parentMerge tag 'trace-probes-v6.2' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
parentrv/monitors: Move monitor structure in rodata (diff)
downloadlinux-9d2f6060fe4c3b49d0cdc1dce1c99296f33379c8.tar.gz
linux-9d2f6060fe4c3b49d0cdc1dce1c99296f33379c8.tar.bz2
linux-9d2f6060fe4c3b49d0cdc1dce1c99296f33379c8.zip
Merge tag 'trace-v6.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace
Pull tracing fix from Steven Rostedt: "I missed this minor hardening of the kernel in the first pull. - Make monitor structures read only" * tag 'trace-v6.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace: rv/monitors: Move monitor structure in rodata
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trace/rv/monitors/wip/wip.h2
-rw-r--r--kernel/trace/rv/monitors/wwnr/wwnr.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/rv/monitors/wip/wip.h b/kernel/trace/rv/monitors/wip/wip.h
index dacc37b62a2c..2e373f2c65ed 100644
--- a/kernel/trace/rv/monitors/wip/wip.h
+++ b/kernel/trace/rv/monitors/wip/wip.h
@@ -27,7 +27,7 @@ struct automaton_wip {
bool final_states[state_max_wip];
};
-static struct automaton_wip automaton_wip = {
+static const struct automaton_wip automaton_wip = {
.state_names = {
"preemptive",
"non_preemptive"
diff --git a/kernel/trace/rv/monitors/wwnr/wwnr.h b/kernel/trace/rv/monitors/wwnr/wwnr.h
index 118e576b91b4..d0d9c4b8121b 100644
--- a/kernel/trace/rv/monitors/wwnr/wwnr.h
+++ b/kernel/trace/rv/monitors/wwnr/wwnr.h
@@ -27,7 +27,7 @@ struct automaton_wwnr {
bool final_states[state_max_wwnr];
};
-static struct automaton_wwnr automaton_wwnr = {
+static const struct automaton_wwnr automaton_wwnr = {
.state_names = {
"not_running",
"running"