Skip to content

Commit

Permalink
Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/k…
Browse files Browse the repository at this point in the history
…ernel/git/vireshk/pm into pm-opp

Pull and OPP update for 4.16-rc2 from Viresh Kumar.

* 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm:
  opp: cpu: Replace GFP_ATOMIC with GFP_KERNEL in dev_pm_opp_init_cpufreq_table
  • Loading branch information
Rafael J. Wysocki committed Feb 12, 2018
2 parents 7928b2c + 4a823c0 commit 0aae2bf
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/opp/cpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ int dev_pm_opp_init_cpufreq_table(struct device *dev,
if (max_opps <= 0)
return max_opps ? max_opps : -ENODATA;

freq_table = kcalloc((max_opps + 1), sizeof(*freq_table), GFP_ATOMIC);
freq_table = kcalloc((max_opps + 1), sizeof(*freq_table), GFP_KERNEL);
if (!freq_table)
return -ENOMEM;

Expand Down

0 comments on commit 0aae2bf

Please sign in to comment.