diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-12-01 07:13:56 -0500 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-12-01 07:13:56 -0500 |
| commit | 307991055b0ce65d53dc1eb501c456c10eb36360 (patch) | |
| tree | 71bb9263dc71344e5d7b97ca6d5cf223f1f1a856 /net/sctp/socket.c | |
| parent | 1198c6d45a1ef5f4f7fdfbf33ef7d270493ec575 (diff) | |
| parent | 9b4320b77bab4031649c484da1c595f39c2e43cd (diff) | |
Merge branch 'kconfig_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next into kbuild/rc-fixes
Diffstat (limited to 'net/sctp/socket.c')
| -rw-r--r-- | net/sctp/socket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index e34ca9cc1167..6bd554323a34 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c | |||
| @@ -111,12 +111,12 @@ static void sctp_sock_migrate(struct sock *, struct sock *, | |||
| 111 | static char *sctp_hmac_alg = SCTP_COOKIE_HMAC_ALG; | 111 | static char *sctp_hmac_alg = SCTP_COOKIE_HMAC_ALG; |
| 112 | 112 | ||
| 113 | extern struct kmem_cache *sctp_bucket_cachep; | 113 | extern struct kmem_cache *sctp_bucket_cachep; |
| 114 | extern int sysctl_sctp_mem[3]; | 114 | extern long sysctl_sctp_mem[3]; |
| 115 | extern int sysctl_sctp_rmem[3]; | 115 | extern int sysctl_sctp_rmem[3]; |
| 116 | extern int sysctl_sctp_wmem[3]; | 116 | extern int sysctl_sctp_wmem[3]; |
| 117 | 117 | ||
| 118 | static int sctp_memory_pressure; | 118 | static int sctp_memory_pressure; |
| 119 | static atomic_t sctp_memory_allocated; | 119 | static atomic_long_t sctp_memory_allocated; |
| 120 | struct percpu_counter sctp_sockets_allocated; | 120 | struct percpu_counter sctp_sockets_allocated; |
| 121 | 121 | ||
| 122 | static void sctp_enter_memory_pressure(struct sock *sk) | 122 | static void sctp_enter_memory_pressure(struct sock *sk) |