summaryrefslogtreecommitdiffstats
path: root/net/sctp/ssnmap.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-10-13 21:22:27 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-10-13 21:22:27 -0400
commit59aee3c2a1e69fe5062bd1facb72d6fcea3f3f8f (patch)
treeb337d73229a69e399d4e4f7128b33ce734660e35 /net/sctp/ssnmap.c
parent0d69ae5fb7eb9ba3b54cf0ba4ef5ae591f31eef7 (diff)
parent046d20b73960b7a2474b6d5e920d54c3fd7c23fe (diff)
downloadtalos-op-linux-59aee3c2a1e69fe5062bd1facb72d6fcea3f3f8f.tar.gz
talos-op-linux-59aee3c2a1e69fe5062bd1facb72d6fcea3f3f8f.zip
Merge branch 'master'
Diffstat (limited to 'net/sctp/ssnmap.c')
-rw-r--r--net/sctp/ssnmap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sctp/ssnmap.c b/net/sctp/ssnmap.c
index 25037daf3fa0..cbe2513d2822 100644
--- a/net/sctp/ssnmap.c
+++ b/net/sctp/ssnmap.c
@@ -58,7 +58,7 @@ static inline size_t sctp_ssnmap_size(__u16 in, __u16 out)
* Allocate room to store at least 'len' contiguous TSNs.
*/
struct sctp_ssnmap *sctp_ssnmap_new(__u16 in, __u16 out,
- unsigned int __nocast gfp)
+ gfp_t gfp)
{
struct sctp_ssnmap *retval;
int size;
OpenPOWER on IntegriCloud