diff options
| author | Anand K Mistry <amistry@google.com> | 2020-11-09 08:52:30 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-11-09 08:52:30 +1100 |
| commit | 14b6c4e8c634e4a6613a274819887f08d6e00d7a (patch) | |
| tree | dbbcd84ad6125c3b9ef02e38429cbaef5b5578c4 | |
| parent | 8cb8cb708e3a49df7ac9e63499fde3d1bb691a98 (diff) | |
| download | linux-14b6c4e8c634e4a6613a274819887f08d6e00d7a.tar.gz linux-14b6c4e8c634e4a6613a274819887f08d6e00d7a.tar.xz | |
proc-provide-details-on-indirect-branch-speculation-v2
remove underscores from field name to workaround documentation issue
Link: https://lkml.kernel.org/r/20201106131015.v2.1.I7782b0cedb705384a634cfd8898eb7523562da99@changeid
Signed-off-by: Anand K Mistry <amistry@google.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Documentation/filesystems/proc.rst | 4 | ||||
| -rw-r--r-- | fs/proc/array.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/filesystems/proc.rst b/Documentation/filesystems/proc.rst index 710dd69614b9..531edaf07924 100644 --- a/Documentation/filesystems/proc.rst +++ b/Documentation/filesystems/proc.rst @@ -210,7 +210,7 @@ read the file /proc/PID/status:: NoNewPrivs: 0 Seccomp: 0 Speculation_Store_Bypass: thread vulnerable - Speculation_Indirect_Branch: conditional enabled + SpeculationIndirectBranch: conditional enabled voluntary_ctxt_switches: 0 nonvoluntary_ctxt_switches: 1 @@ -293,7 +293,7 @@ It's slow but very precise. NoNewPrivs no_new_privs, like prctl(PR_GET_NO_NEW_PRIV, ...) Seccomp seccomp mode, like prctl(PR_GET_SECCOMP, ...) Speculation_Store_Bypass speculative store bypass mitigation status - Speculation_Indirect_Branch indirect branch speculation mode + SpeculationIndirectBranch indirect branch speculation mode Cpus_allowed mask of CPUs on which this process may run Cpus_allowed_list Same as previous, but in "list format" Mems_allowed mask of memory nodes allowed to this process diff --git a/fs/proc/array.c b/fs/proc/array.c index ce4fa948c9dd..014c1859554d 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c @@ -369,7 +369,7 @@ static inline void task_seccomp(struct seq_file *m, struct task_struct *p) break; } - seq_puts(m, "\nSpeculation_Indirect_Branch:\t"); + seq_puts(m, "\nSpeculationIndirectBranch:\t"); switch (arch_prctl_spec_ctrl_get(p, PR_SPEC_INDIRECT_BRANCH)) { case -EINVAL: seq_puts(m, "unsupported"); |