diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-26 18:04:59 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-26 18:04:59 -0400 |
commit | d9ecdb282c91952796b7542c4f57fd6de6948d7b (patch) | |
tree | fd4de7923968afa7d2981fb037e2255fc2cfa1e1 /net/socket.c | |
parent | 4ef584ba84125b67c17b5aded38e7783cd8cdef0 (diff) | |
parent | 1d1f8b377c48e5aeddaea52eba74cc0539f088cd (diff) |
Merge branch 'for_rmk_13' of git://git.mnementh.co.uk/linux-2.6-im
Diffstat (limited to 'net/socket.c')
-rw-r--r-- | net/socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c index 1310a82cbba7..8ef8ba81b9e2 100644 --- a/net/socket.c +++ b/net/socket.c | |||
@@ -265,7 +265,7 @@ static void sock_destroy_inode(struct inode *inode) | |||
265 | container_of(inode, struct socket_alloc, vfs_inode)); | 265 | container_of(inode, struct socket_alloc, vfs_inode)); |
266 | } | 266 | } |
267 | 267 | ||
268 | static void init_once(struct kmem_cache *cachep, void *foo) | 268 | static void init_once(void *foo) |
269 | { | 269 | { |
270 | struct socket_alloc *ei = (struct socket_alloc *)foo; | 270 | struct socket_alloc *ei = (struct socket_alloc *)foo; |
271 | 271 | ||