diff options
| author | Thomas Bogendoerfer <tsbogend@alpha.franken.de> | 2020-03-30 14:31:37 +0300 |
|---|---|---|
| committer | Thomas Bogendoerfer <tsbogend@alpha.franken.de> | 2020-03-30 14:31:37 +0300 |
| commit | ba15533275dd70238b523417d222d43fb40dac9d (patch) | |
| tree | e97f6b804994d20ce476dc5a123fc074799e9584 /net/unix/af_unix.c | |
| parent | f75410a406e934e4cf31e0a7ec151799a6bf38cf (diff) | |
| parent | 7111951b8d4973bda27ff663f2cf18b663d15b48 (diff) | |
| download | linux-ba15533275dd70238b523417d222d43fb40dac9d.tar.xz | |
Merge tag 'v5.6' into mips-next
Linux 5.6
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, |