diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-04-30 01:36:34 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-04-30 01:36:34 +0200 |
| commit | 48ce3b7cc66b31cd8ae1b8155a82426308f71491 (patch) | |
| tree | fc7eb8e35803f5360e13968e19bd080acb99bc7b | |
| parent | powerpc/tm: Add checking to treclaim/trechkpt (diff) | |
| parent | cpufreq, powernv: Fix build failure on UP (diff) | |
| download | linux-48ce3b7cc66b31cd8ae1b8155a82426308f71491.tar.xz linux-48ce3b7cc66b31cd8ae1b8155a82426308f71491.zip | |
Merge commit 'f3cae355a962784101478504ef7f6a389ad62979' into next
Merge Linus tree to get "cpufreq, powernv: Fix build failure on UP"
to avoid build breakages in some of my test configs.
| -rw-r--r-- | drivers/cpufreq/powernv-cpufreq.c | 1 | ||||
| -rw-r--r-- | drivers/cpufreq/unicore2-cpufreq.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/cpufreq/powernv-cpufreq.c b/drivers/cpufreq/powernv-cpufreq.c index 9edccc63245d..af4968813e76 100644 --- a/drivers/cpufreq/powernv-cpufreq.c +++ b/drivers/cpufreq/powernv-cpufreq.c @@ -29,6 +29,7 @@ #include <asm/cputhreads.h> #include <asm/reg.h> +#include <asm/smp.h> /* Required for cpu_sibling_mask() in UP configs */ #define POWERNV_MAX_PSTATES 256 diff --git a/drivers/cpufreq/unicore2-cpufreq.c b/drivers/cpufreq/unicore2-cpufreq.c index 8d045afa7fb4..6f9dfa80563a 100644 --- a/drivers/cpufreq/unicore2-cpufreq.c +++ b/drivers/cpufreq/unicore2-cpufreq.c @@ -60,9 +60,7 @@ static int __init ucv2_cpu_init(struct cpufreq_policy *policy) policy->max = policy->cpuinfo.max_freq = 1000000; policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL; policy->clk = clk_get(NULL, "MAIN_CLK"); - if (IS_ERR(policy->clk)) - return PTR_ERR(policy->clk); - return 0; + return PTR_ERR_OR_ZERO(policy->clk); } static struct cpufreq_driver ucv2_driver = { |