diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-19 20:02:01 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-19 20:02:01 -0400 |
| commit | 10ce3cc919f50c2043b41ca968b43c26a3672600 (patch) | |
| tree | ea409366a5208aced495bc0516a08b81fd43222e /net/tipc/ref.c | |
| parent | 24e3e5ae1e4c2a3a32f5b1f96b4e3fd721806acd (diff) | |
| parent | 5c6a7a62c130afef3d61c1dee153012231ff5cd9 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'net/tipc/ref.c')
| -rw-r--r-- | net/tipc/ref.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/tipc/ref.c b/net/tipc/ref.c index 83116892528b..9e37b7812c3c 100644 --- a/net/tipc/ref.c +++ b/net/tipc/ref.c | |||
| @@ -110,8 +110,7 @@ int tipc_ref_table_init(u32 requested_size, u32 start) | |||
| 110 | 110 | ||
| 111 | /* allocate table & mark all entries as uninitialized */ | 111 | /* allocate table & mark all entries as uninitialized */ |
| 112 | 112 | ||
| 113 | table = __vmalloc(actual_size * sizeof(struct reference), | 113 | table = vzalloc(actual_size * sizeof(struct reference)); |
| 114 | GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL); | ||
| 115 | if (table == NULL) | 114 | if (table == NULL) |
| 116 | return -ENOMEM; | 115 | return -ENOMEM; |
| 117 | 116 | ||