diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-15 01:33:11 -0500 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-15 01:33:11 -0500 |
| commit | 1bb95834bbcdc969e477a9284cf96c17a4c2616f (patch) | |
| tree | 9cf66b22a611bb6bc78778c05dac72263bb45a23 /include/net/udp.h | |
| parent | 85345517fe6d4de27b0d6ca19fef9d28ac947c4a (diff) | |
| parent | a41c73e04673b47730df682446f0d52f95e32a5b (diff) | |
Merge remote branch 'airlied/drm-fixes' into drm-intel-fixes
Diffstat (limited to 'include/net/udp.h')
| -rw-r--r-- | include/net/udp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/udp.h b/include/net/udp.h index 200b82848c9a..bb967dd59bf7 100644 --- a/include/net/udp.h +++ b/include/net/udp.h | |||
| @@ -105,10 +105,10 @@ static inline struct udp_hslot *udp_hashslot2(struct udp_table *table, | |||
| 105 | 105 | ||
| 106 | extern struct proto udp_prot; | 106 | extern struct proto udp_prot; |
| 107 | 107 | ||
| 108 | extern atomic_t udp_memory_allocated; | 108 | extern atomic_long_t udp_memory_allocated; |
| 109 | 109 | ||
| 110 | /* sysctl variables for udp */ | 110 | /* sysctl variables for udp */ |
| 111 | extern int sysctl_udp_mem[3]; | 111 | extern long sysctl_udp_mem[3]; |
| 112 | extern int sysctl_udp_rmem_min; | 112 | extern int sysctl_udp_rmem_min; |
| 113 | extern int sysctl_udp_wmem_min; | 113 | extern int sysctl_udp_wmem_min; |
| 114 | 114 | ||