diff options
| author | Srinivas Kandagatla <srinivas.kandagatla@linaro.org> | 2016-01-12 10:27:37 +0000 |
|---|---|---|
| committer | Srinivas Kandagatla <srinivas.kandagatla@linaro.org> | 2016-01-12 10:27:37 +0000 |
| commit | 8191096ab56b963a15f0d98c1d878df383314eb5 (patch) | |
| tree | ec957b60c25e4683efefe31d449e5ffc2812f054 | |
| parent | a97951a74ef8f34231deb68a4eb83b2916fa703d (diff) | |
reproduce crashto-archit-v4.4
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
| -rw-r--r-- | arch/arm64/boot/dts/qcom/msm8916.dtsi | 16 | ||||
| -rw-r--r-- | drivers/base/power/opp/core.c | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi index a7024deaf3a1b..51012775d345a 100644 --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi @@ -240,6 +240,14 @@ }; }; + smem { + compatible = "qcom,smem"; + + memory-region = <&smem_mem>; + qcom,rpm-msg-ram = <&rpm_msg_ram>; + + hwlocks = <&tcsr_mutex 3>; + }; soc: soc { #address-cells = <1>; #size-cells = <1>; @@ -1007,14 +1015,6 @@ }; }; - smem { - compatible = "qcom,smem"; - - memory-region = <&smem_mem>; - qcom,rpm-msg-ram = <&rpm_msg_ram>; - - hwlocks = <&tcsr_mutex 3>; - }; smd { compatible = "qcom,smd"; diff --git a/drivers/base/power/opp/core.c b/drivers/base/power/opp/core.c index d2ce16bbd1cf2..c057e9c4d7660 100644 --- a/drivers/base/power/opp/core.c +++ b/drivers/base/power/opp/core.c @@ -92,7 +92,7 @@ struct device_opp *_find_device_opp(struct device *dev) { struct device_opp *dev_opp; - opp_rcu_lockdep_assert(NULL); +// opp_rcu_lockdep_assert(NULL); if (IS_ERR_OR_NULL(dev)) { pr_err("%s: Invalid parameters\n", __func__); |