diff --git a/drivers/clk/qcom/common.h b/drivers/clk/qcom/common.h index 71c714f619b7..8c5db6e098d7 100644 --- a/drivers/clk/qcom/common.h +++ b/drivers/clk/qcom/common.h @@ -1,9 +1,10 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -/* Copyright (c) 2014, 2018-2019, The Linux Foundation. All rights reserved. */ +/* Copyright (c) 2014, 2018-2020, The Linux Foundation. All rights reserved. */ #ifndef __QCOM_CLK_COMMON_H__ #define __QCOM_CLK_COMMON_H__ +#include #include struct platform_device; @@ -12,7 +13,6 @@ struct clk_regmap; struct qcom_reset_map; struct regmap; struct freq_tbl; -struct clk_hw; #define PLL_LOCK_COUNT_SHIFT 8 #define PLL_LOCK_COUNT_MASK 0x3f diff --git a/drivers/devfreq/arm-memlat-mon.c b/drivers/devfreq/arm-memlat-mon.c index 9a554cfd3154..6e229ebeda96 100644 --- a/drivers/devfreq/arm-memlat-mon.c +++ b/drivers/devfreq/arm-memlat-mon.c @@ -607,7 +607,8 @@ static int memlat_mon_probe(struct platform_device *pdev, bool is_compute) if (!cpumask_subset(&mon->cpus, &cpu_grp->cpus)) { dev_err(dev, "Mon CPUs must be a subset of cpu_grp CPUs. mon=%*pbl cpu_grp=%*pbl\n", - mon->cpus, cpu_grp->cpus); + cpumask_pr_args(&mon->cpus), + cpumask_pr_args(&cpu_grp->cpus)); ret = -EINVAL; goto unlock_out; } diff --git a/drivers/devfreq/governor_bw_hwmon.h b/drivers/devfreq/governor_bw_hwmon.h index 576dafbc651f..8cde9ce4c265 100644 --- a/drivers/devfreq/governor_bw_hwmon.h +++ b/drivers/devfreq/governor_bw_hwmon.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * Copyright (c) 2014-2016, 2019, The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2016, 2019-2020, The Linux Foundation. All rights reserved. */ #ifndef _GOVERNOR_BW_HWMON_H @@ -58,7 +58,7 @@ struct bw_hwmon { struct devfreq *df; }; -#ifdef CONFIG_DEVFREQ_GOV_QCOM_BW_HWMON +#if IS_ENABLED(CONFIG_DEVFREQ_GOV_QCOM_BW_HWMON) int register_bw_hwmon(struct device *dev, struct bw_hwmon *hwmon); int update_bw_hwmon(struct bw_hwmon *hwmon); int bw_hwmon_sample_end(struct bw_hwmon *hwmon); diff --git a/drivers/devfreq/governor_cache_hwmon.h b/drivers/devfreq/governor_cache_hwmon.h index 26e7313a841f..4d5aa3dc7918 100644 --- a/drivers/devfreq/governor_cache_hwmon.h +++ b/drivers/devfreq/governor_cache_hwmon.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * Copyright (c) 2014, 2016, 2019, The Linux Foundation. All rights reserved. + * Copyright (c) 2014, 2016, 2019-2020, The Linux Foundation. All rights reserved. */ #ifndef _GOVERNOR_CACHE_HWMON_H @@ -46,7 +46,7 @@ struct cache_hwmon { struct devfreq *df; }; -#ifdef CONFIG_DEVFREQ_GOV_QCOM_CACHE_HWMON +#if IS_ENABLED(CONFIG_DEVFREQ_GOV_QCOM_CACHE_HWMON) int register_cache_hwmon(struct device *dev, struct cache_hwmon *hwmon); int update_cache_hwmon(struct cache_hwmon *hwmon); #else diff --git a/drivers/devfreq/governor_memlat.h b/drivers/devfreq/governor_memlat.h index 7fe65f4caf8c..a7e79b241290 100644 --- a/drivers/devfreq/governor_memlat.h +++ b/drivers/devfreq/governor_memlat.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * Copyright (c) 2015-2017, 2019, The Linux Foundation. All rights reserved. + * Copyright (c) 2015-2017, 2019-2020, The Linux Foundation. All rights reserved. */ #ifndef _GOVERNOR_MEMLAT_H @@ -68,7 +68,7 @@ struct memlat_hwmon { bool should_ignore_df_monitor; }; -#ifdef CONFIG_DEVFREQ_GOV_MEMLAT +#if IS_ENABLED(CONFIG_DEVFREQ_GOV_MEMLAT) int register_memlat(struct device *dev, struct memlat_hwmon *hw); int register_compute(struct device *dev, struct memlat_hwmon *hw); int update_memlat(struct memlat_hwmon *hw); diff --git a/drivers/dma-buf/dma-buf-ref.c b/drivers/dma-buf/dma-buf-ref.c index 09aa80681ac3..1adbb837d465 100644 --- a/drivers/dma-buf/dma-buf-ref.c +++ b/drivers/dma-buf/dma-buf-ref.c @@ -77,6 +77,7 @@ void dma_buf_ref_mod(struct msm_dma_buf *msm_dma_buf, int nr) dma_buf_ref_insert_handle(msm_dma_buf, handle, nr); } +EXPORT_SYMBOL(dma_buf_ref_mod); /** * Called with dmabuf->lock held diff --git a/drivers/gpu/msm/governor_gpubw_mon.c b/drivers/gpu/msm/governor_gpubw_mon.c index f133b37fb4ca..8813cc60c921 100644 --- a/drivers/gpu/msm/governor_gpubw_mon.c +++ b/drivers/gpu/msm/governor_gpubw_mon.c @@ -1,13 +1,12 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Copyright (c) 2014-2019, The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2020, The Linux Foundation. All rights reserved. */ #include #include #include -#include "devfreq_trace.h" #include "../../devfreq/governor.h" #include "msm_adreno_devfreq.h" diff --git a/drivers/iommu/dma-mapping-fast.c b/drivers/iommu/dma-mapping-fast.c index b3d0f0aeed25..e309014e22d1 100644 --- a/drivers/iommu/dma-mapping-fast.c +++ b/drivers/iommu/dma-mapping-fast.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved. + * Copyright (c) 2016-2020, The Linux Foundation. All rights reserved. */ #include @@ -1028,6 +1028,7 @@ void fast_smmu_put_dma_cookie(struct iommu_domain *domain) kfree(fast); domain->iova_cookie = NULL; } +EXPORT_SYMBOL(fast_smmu_put_dma_cookie); const struct dma_map_ops *fast_smmu_get_dma_ops(void) { @@ -1081,3 +1082,4 @@ finish: fast_smmu_reserve_pci_windows(dev, fast); return 0; } +EXPORT_SYMBOL(fast_smmu_init_mapping); diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c index a45413de6dff..a43706711b9c 100644 --- a/drivers/pinctrl/qcom/pinctrl-msm.c +++ b/drivers/pinctrl/qcom/pinctrl-msm.c @@ -1266,6 +1266,7 @@ int msm_qup_write(u32 mode, u32 val) return -ENOENT; } +EXPORT_SYMBOL(msm_qup_write); int msm_qup_read(unsigned int mode) { diff --git a/drivers/soc/qcom/rpmh_master_stat.h b/drivers/soc/qcom/rpmh_master_stat.h index a281029c18e9..d006f9c58fa8 100644 --- a/drivers/soc/qcom/rpmh_master_stat.h +++ b/drivers/soc/qcom/rpmh_master_stat.h @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved. + * Copyright (c) 2018-2020, The Linux Foundation. All rights reserved. */ #ifndef __QCOM_RPM_STATS_LOG_H__ #define __QCOM_RPM_STATS_LOG_H__ -#if defined(CONFIG_QTI_RPM_STATS_LOG) +#if IS_ENABLED(CONFIG_QTI_RPM_STATS_LOG) void msm_rpmh_master_stats_update(void); diff --git a/drivers/soc/qcom/soc_sleep_stats.c b/drivers/soc/qcom/soc_sleep_stats.c index 3aff2e2983d8..c7beb005a0af 100644 --- a/drivers/soc/qcom/soc_sleep_stats.c +++ b/drivers/soc/qcom/soc_sleep_stats.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Copyright (c) 2011-2019, The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2020, The Linux Foundation. All rights reserved. */ #define pr_fmt(fmt) "%s: " fmt, __func__ @@ -140,7 +140,7 @@ static int soc_sleep_stats_create_sysfs(struct platform_device *pdev, if (!drv->kobj) return -ENOMEM; - sysfs_attr_init(drv->ka.attr); + sysfs_attr_init(&drv->ka.attr); drv->ka.attr.mode = 0444; drv->ka.attr.name = "stats"; drv->ka.show = stats_show; diff --git a/drivers/thermal/fair_share.c b/drivers/thermal/fair_share.c index afd99f668c65..cc22195af8b5 100644 --- a/drivers/thermal/fair_share.c +++ b/drivers/thermal/fair_share.c @@ -40,7 +40,7 @@ static int get_trip_level(struct thermal_zone_device *tz) */ if (count > 0) { tz->ops->get_trip_type(tz, count - 1, &trip_type); - trace_thermal_zone_trip(tz, count - 1, trip_type); + trace_thermal_zone_trip(tz, count - 1, trip_type, true); } return count; diff --git a/kernel/trace/power-traces.c b/kernel/trace/power-traces.c index 21bb161c2316..95d81de6589e 100644 --- a/kernel/trace/power-traces.c +++ b/kernel/trace/power-traces.c @@ -19,3 +19,9 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(cpu_idle); EXPORT_TRACEPOINT_SYMBOL_GPL(cpu_frequency); EXPORT_TRACEPOINT_SYMBOL_GPL(powernv_throttle); +EXPORT_TRACEPOINT_SYMBOL(memlat_dev_update); +EXPORT_TRACEPOINT_SYMBOL(memlat_dev_meas); +EXPORT_TRACEPOINT_SYMBOL(cache_hwmon_update); +EXPORT_TRACEPOINT_SYMBOL(cache_hwmon_meas); +EXPORT_TRACEPOINT_SYMBOL(bw_hwmon_update); +EXPORT_TRACEPOINT_SYMBOL(bw_hwmon_meas);