diff options
| author | Kevin Hilman <khilman@linaro.org> | 2014-05-19 14:14:35 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-19 18:01:19 +0100 |
| commit | b93678a7c55eba468bbdf2b65df8dc22f1b1aee9 (patch) | |
| tree | 95abc46e3bcb222d407a49de7384cd9d9afc0b37 /drivers/base | |
| parent | 266a1aedb2d55c3fe9db93c5f6646942d4781cb6 (diff) | |
devres: restore zeroing behavior of devres_alloc()v3.10/topic/devm
commit 64c862a8 (devres: add kernel standard devm_k.alloc functions) changed
the default behavior of alloc_dr() to no longer zero the allocated memory. However,
only the devm.k.alloc() function were modified to pass in __GFP_ZERO which leaves
any users of devres_alloc() or __devres_alloc() with potentially wrong assumptions
about memory being zero'd upon allocation.
To fix, add __GFP_ZERO to devres_alloc() calls to preserve previous
behavior of zero'ing memory upon allocation.
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 6fffcfa7c0fc438d3667b4eb2074d94f69c12c7b)
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/devres.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/devres.c b/drivers/base/devres.c index 37e67a26e388..545c4de412c3 100644 --- a/drivers/base/devres.c +++ b/drivers/base/devres.c @@ -111,7 +111,7 @@ void * __devres_alloc(dr_release_t release, size_t size, gfp_t gfp, { struct devres *dr; - dr = alloc_dr(release, size, gfp); + dr = alloc_dr(release, size, gfp | __GFP_ZERO); if (unlikely(!dr)) return NULL; set_node_dbginfo(&dr->node, name, size); @@ -136,7 +136,7 @@ void * devres_alloc(dr_release_t release, size_t size, gfp_t gfp) { struct devres *dr; - dr = alloc_dr(release, size, gfp); + dr = alloc_dr(release, size, gfp | __GFP_ZERO); if (unlikely(!dr)) return NULL; return dr->data; |