Commit 4c7eb4eb authored by Magnus Damm's avatar Magnus Damm Committed by Paul Mundt

sh: use kzalloc() for cpg clocks

Convert the shared clock cpg code from bootmem to slab.
Without this patch the current bootmem code triggers
WARN_ON() because the slab is available.
Signed-off-by: default avatarMagnus Damm <damm@igel.co.jp>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 0ec39885
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/compiler.h> #include <linux/compiler.h>
#include <linux/bootmem.h> #include <linux/slab.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm/clock.h> #include <asm/clock.h>
...@@ -127,10 +127,11 @@ int __init sh_clk_div6_register(struct clk *clks, int nr) ...@@ -127,10 +127,11 @@ int __init sh_clk_div6_register(struct clk *clks, int nr)
int k; int k;
freq_table_size *= (nr_divs + 1); freq_table_size *= (nr_divs + 1);
freq_table = kzalloc(freq_table_size * nr, GFP_KERNEL);
freq_table = alloc_bootmem(freq_table_size * nr); if (!freq_table) {
if (!freq_table) pr_err("sh_clk_div6_register: unable to alloc memory\n");
return -ENOMEM; return -ENOMEM;
}
for (k = 0; !ret && (k < nr); k++) { for (k = 0; !ret && (k < nr); k++) {
clkp = clks + k; clkp = clks + k;
...@@ -175,10 +176,11 @@ int __init sh_clk_div4_register(struct clk *clks, int nr, ...@@ -175,10 +176,11 @@ int __init sh_clk_div4_register(struct clk *clks, int nr,
int k; int k;
freq_table_size *= (nr_divs + 1); freq_table_size *= (nr_divs + 1);
freq_table = kzalloc(freq_table_size * nr, GFP_KERNEL);
freq_table = alloc_bootmem(freq_table_size * nr); if (!freq_table) {
if (!freq_table) pr_err("sh_clk_div4_register: unable to alloc memory\n");
return -ENOMEM; return -ENOMEM;
}
for (k = 0; !ret && (k < nr); k++) { for (k = 0; !ret && (k < nr); k++) {
clkp = clks + k; clkp = clks + k;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment