diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-06 17:44:28 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-06 17:44:28 +0800 |
| commit | d083f580e5b940834a93ab741cdf064f0324dc0f (patch) | |
| tree | d034075e47d68179d2f8bf7220d26bef0ba740d3 /lib/cpumask.c | |
| parent | 931f27c6e892fdfe98896055e0df7962e21969d9 (diff) | |
| parent | 13ff50c85846338bb9820abd3933227b678dc086 (diff) | |
Merge tag 'parse-val' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into asoc-core
regmap: Add parse_val() API
This is useful for generic code built on top of regmap dealing with
blocks of data.
Diffstat (limited to 'lib/cpumask.c')
| -rw-r--r-- | lib/cpumask.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/cpumask.c b/lib/cpumask.c index d327b87c99b7..b810b753c607 100644 --- a/lib/cpumask.c +++ b/lib/cpumask.c @@ -140,7 +140,7 @@ EXPORT_SYMBOL(zalloc_cpumask_var); */ void __init alloc_bootmem_cpumask_var(cpumask_var_t *mask) { - *mask = alloc_bootmem(cpumask_size()); + *mask = memblock_virt_alloc(cpumask_size(), 0); } /** @@ -161,6 +161,6 @@ EXPORT_SYMBOL(free_cpumask_var); */ void __init free_bootmem_cpumask_var(cpumask_var_t mask) { - free_bootmem(__pa(mask), cpumask_size()); + memblock_free_early(__pa(mask), cpumask_size()); } #endif |