diff options
| author | Takashi Iwai | 2019-02-28 13:30:55 +0100 |
|---|---|---|
| committer | Takashi Iwai | 2019-02-28 13:30:55 +0100 |
| commit | 70395a96bd882d8dba669f99b5cec0008690accd (patch) | |
| tree | 37f3a4c2cf35828f153f3ce59c3daa4f39241c32 /include/net/sock.h | |
| parent | ALSA: firewire-motu: fix construction of PCM frame for capture direction (diff) | |
| parent | Merge branch 'asoc-5.1' into asoc-next (diff) | |
| download | kernel-qcow2-linux-70395a96bd882d8dba669f99b5cec0008690accd.tar.gz kernel-qcow2-linux-70395a96bd882d8dba669f99b5cec0008690accd.tar.xz kernel-qcow2-linux-70395a96bd882d8dba669f99b5cec0008690accd.zip | |
Merge tag 'asoc-v5.1-2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: More changes for v5.1
Another batch of changes for ASoC, no big core changes - it's mainly
small fixes and improvements for individual drivers.
- A big refresh and cleanup of the Samsung drivers, fixing a number of
issues which allow the driver to be used with a wider range of
userspaces.
- Fixes for the Intel drivers to make them more standard so less likely
to get bitten by core issues.
- New driver for Cirrus Logic CS35L26.
Diffstat (limited to 'include/net/sock.h')
| -rw-r--r-- | include/net/sock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 2b229f7be8eb..f43f935cb113 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1277,7 +1277,7 @@ static inline void sk_sockets_allocated_inc(struct sock *sk) percpu_counter_inc(sk->sk_prot->sockets_allocated); } -static inline int +static inline u64 sk_sockets_allocated_read_positive(struct sock *sk) { return percpu_counter_read_positive(sk->sk_prot->sockets_allocated); |