diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 13:16:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 13:16:40 -0700 |
| commit | 9ffc7a0ebfcace0ed3eb77fb77e159f6f9443ec5 (patch) | |
| tree | 4d4353bb6535aec7822ea71e594154979728e484 /net/sctp/transport.c | |
| parent | 2824bd250f0be1551747cc3ed5ae07facc285b57 (diff) | |
| parent | f4637b55ba960d9987a836617271659e9b7b0de8 (diff) | |
| download | op-kernel-dev-9ffc7a0ebfcace0ed3eb77fb77e159f6f9443ec5.zip op-kernel-dev-9ffc7a0ebfcace0ed3eb77fb77e159f6f9443ec5.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/sctp/transport.c')
| -rw-r--r-- | net/sctp/transport.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/sctp/transport.c b/net/sctp/transport.c index a63b691..d2f04eb 100644 --- a/net/sctp/transport.c +++ b/net/sctp/transport.c @@ -57,7 +57,7 @@ /* Initialize a new transport from provided memory. */ static struct sctp_transport *sctp_transport_init(struct sctp_transport *peer, const union sctp_addr *addr, - int gfp) + unsigned int __nocast gfp) { /* Copy in the address. */ peer->ipaddr = *addr; @@ -121,7 +121,8 @@ static struct sctp_transport *sctp_transport_init(struct sctp_transport *peer, } /* Allocate and initialize a new transport. */ -struct sctp_transport *sctp_transport_new(const union sctp_addr *addr, int gfp) +struct sctp_transport *sctp_transport_new(const union sctp_addr *addr, + unsigned int __nocast gfp) { struct sctp_transport *transport; |
