diff options
| author |   Mark Brown <broonie@kernel.org> | 2017-01-09 12:20:41 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-01-09 12:20:41 +0000 |
| commit | 5c47e3cfd4f9d12e9f594d99118c1381c163ff98 (patch) | |
| tree | a7650ab5c0fa3a6a3841de8e8693041b3e009054 /fs/proc/array.c | |
| parent | Merge remote-tracking branches 'spi/topic/spidev', 'spi/topic/sunxi', 'spi/topic/ti-qspi', 'spi/topic/topcliff-pch' and 'spi/topic/xlp' into spi-next (diff) | |
| parent | Linux 4.10-rc1 (diff) | |
| download | wireguard-linux-5c47e3cfd4f9d12e9f594d99118c1381c163ff98.tar.xz wireguard-linux-5c47e3cfd4f9d12e9f594d99118c1381c163ff98.zip | |
Merge tag 'v4.10-rc1' into spi-s3c64xx
Linux 4.10-rc1
Diffstat (limited to '')
| -rw-r--r-- | fs/proc/array.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/proc/array.c b/fs/proc/array.c index 81818adb8e9e..51a4213afa2e 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c @@ -245,7 +245,7 @@ void render_sigset_t(struct seq_file *m, const char *header, if (sigismember(set, i+2)) x |= 2; if (sigismember(set, i+3)) x |= 4; if (sigismember(set, i+4)) x |= 8; - seq_printf(m, "%x", x); + seq_putc(m, hex_asc[x]); } while (i >= 4); seq_putc(m, '\n'); @@ -342,10 +342,11 @@ static inline void task_cap(struct seq_file *m, struct task_struct *p) static inline void task_seccomp(struct seq_file *m, struct task_struct *p) { + seq_put_decimal_ull(m, "NoNewPrivs:\t", task_no_new_privs(p)); #ifdef CONFIG_SECCOMP - seq_put_decimal_ull(m, "Seccomp:\t", p->seccomp.mode); - seq_putc(m, '\n'); + seq_put_decimal_ull(m, "\nSeccomp:\t", p->seccomp.mode); #endif + seq_putc(m, '\n'); } static inline void task_context_switch_counts(struct seq_file *m, |