diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 20:06:47 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 20:06:47 -0500 |
| commit | 45ed344cc7b6456856b4ae5e3d81cdb18b98f8ad (patch) | |
| tree | ba64db58e1d4d1fb67b3b666279ebb8e4f7fb42a /net/sunrpc/svc.c | |
| parent | 99535ac2d4d95dbcad6b8d8a04ea57a891fb533b (diff) | |
| parent | bb7e8c5a55c1f5d4192f4b61a84a791796ebf0c3 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/sunrpc/svc.c')
| -rw-r--r-- | net/sunrpc/svc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c index a8bd34d47425..b08419e1fc68 100644 --- a/net/sunrpc/svc.c +++ b/net/sunrpc/svc.c | |||
| @@ -32,7 +32,7 @@ svc_create(struct svc_program *prog, unsigned int bufsize) | |||
| 32 | int vers; | 32 | int vers; |
| 33 | unsigned int xdrsize; | 33 | unsigned int xdrsize; |
| 34 | 34 | ||
| 35 | if (!(serv = (struct svc_serv *) kmalloc(sizeof(*serv), GFP_KERNEL))) | 35 | if (!(serv = kmalloc(sizeof(*serv), GFP_KERNEL))) |
| 36 | return NULL; | 36 | return NULL; |
| 37 | memset(serv, 0, sizeof(*serv)); | 37 | memset(serv, 0, sizeof(*serv)); |
| 38 | serv->sv_name = prog->pg_name; | 38 | serv->sv_name = prog->pg_name; |