diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-03-06 14:49:56 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-03-06 14:49:56 +0300 |
| commit | 1b10d388d094bb32129060236add6f50b204a69d (patch) | |
| tree | 08272a4d89833d139e615b07675f95e403cdddbd /net/unix/af_unix.c | |
| parent | a0f03b617c3b2644d3d47bf7d9e60aed01bd5b10 (diff) | |
| parent | 8b614cb8f1dcac8ca77cf4dd85f46ef3055f8238 (diff) | |
| download | linux-1b10d388d094bb32129060236add6f50b204a69d.tar.xz | |
Merge branch 'linus' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/unix/af_unix.c')
| -rw-r--r-- | net/unix/af_unix.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 62c12cb5763e..68debcb28fa4 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -682,6 +682,7 @@ static int unix_set_peek_off(struct sock *sk, int val) return 0; } +#ifdef CONFIG_PROC_FS static void unix_show_fdinfo(struct seq_file *m, struct socket *sock) { struct sock *sk = sock->sk; @@ -692,6 +693,9 @@ static void unix_show_fdinfo(struct seq_file *m, struct socket *sock) seq_printf(m, "scm_fds: %u\n", READ_ONCE(u->scm_stat.nr_fds)); } } +#else +#define unix_show_fdinfo NULL +#endif static const struct proto_ops unix_stream_ops = { .family = PF_UNIX, |