projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
[powerpc.git]
/
net
/
sctp
/
chunk.c
diff --git
a/net/sctp/chunk.c
b/net/sctp/chunk.c
index
61da293
..
77fb7b0
100644
(file)
--- a/
net/sctp/chunk.c
+++ b/
net/sctp/chunk.c
@@
-3,7
+3,7
@@
*
* This file is part of the SCTP kernel reference Implementation
*
*
* This file is part of the SCTP kernel reference Implementation
*
- * This file contains the code relating the
the
chunk abstraction.
+ * This file contains the code relating the chunk abstraction.
*
* The SCTP reference implementation is free software;
* you can redistribute it and/or modify it under the terms of
*
* The SCTP reference implementation is free software;
* you can redistribute it and/or modify it under the terms of
@@
-62,7
+62,7
@@
static void sctp_datamsg_init(struct sctp_datamsg *msg)
}
/* Allocate and initialize datamsg. */
}
/* Allocate and initialize datamsg. */
-SCTP_STATIC struct sctp_datamsg *sctp_datamsg_new(
unsigned int __nocas
t gfp)
+SCTP_STATIC struct sctp_datamsg *sctp_datamsg_new(
gfp_
t gfp)
{
struct sctp_datamsg *msg;
msg = kmalloc(sizeof(struct sctp_datamsg), gfp);
{
struct sctp_datamsg *msg;
msg = kmalloc(sizeof(struct sctp_datamsg), gfp);