diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2020-03-08 09:57:58 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-03-08 09:57:58 +0100 |
| commit | 6120681bdf1a1c648e8c555704b71e04abe2e899 (patch) | |
| tree | a8a3f55c4ed771dc57082d8af2f8d28ab6e5d341 /net/unix/af_unix.c | |
| parent | Merge tag 'efi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/core (diff) | |
| parent | efi: Add a sanity check to efivar_store_raw() (diff) | |
| download | linux-dev-6120681bdf1a1c648e8c555704b71e04abe2e899.tar.xz linux-dev-6120681bdf1a1c648e8c555704b71e04abe2e899.zip | |
Merge branch 'efi/urgent' into efi/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, |