Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 772a81c4 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drivers: qcom: fix compilation errors" into msm-4.14

parents af7e419a 1dd0857f

drivers/cpuidle/lpm-levels.c

+3 −4
Original line number Diff line number Diff line
@@ -1343,7 +1343,8 @@ static int lpm_cpuidle_enter(struct cpuidle_device *dev, 
	struct lpm_cpu *cpu = per_cpu(cpu_lpm, dev->cpu);

	bool success = true;

	const struct cpumask *cpumask = get_cpu_mask(dev->cpu);

	int64_t start_time = ktime_to_ns(ktime_get()), end_time;

	ktime_t start = ktime_get();

	uint64_t start_time = ktime_to_ns(start), end_time;

	struct power_params *pwr_params;



	pwr_params = &cpu->levels[idx].pwr;
@@ -1365,9 +1366,7 @@ static int lpm_cpuidle_enter(struct cpuidle_device *dev, 


	cluster_unprepare(cpu->parent, cpumask, idx, true, end_time);

	cpu_unprepare(cpu, idx, true);

	end_time = ktime_to_ns(ktime_get()) - start_time;

	do_div(end_time, 1000);

	dev->last_residency = end_time;

	dev->last_residency = ktime_us_delta(ktime_get(), start);

	update_history(dev, idx);

	trace_cpu_idle_exit(idx, success);

	local_irq_enable();

drivers/cpuidle/lpm-levels.h

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ uint32_t *get_per_cpu_max_residency(int cpu); 
uint32_t *get_per_cpu_min_residency(int cpu);

extern struct lpm_cluster *lpm_root_node;



#if CONFIG_SMP

#if defined(CONFIG_SMP)

extern DEFINE_PER_CPU(bool, pending_ipi);

static inline bool is_IPI_pending(const struct cpumask *mask)

{

drivers/soc/qcom/lpm-stats.c

+2 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ struct level_stats { 
	int64_t max_time[CONFIG_MSM_IDLE_STATS_BUCKET_COUNT];

	int success_count;

	int failed_count;

	int64_t total_time;

	uint64_t total_time;

	uint64_t enter_time;

};
@@ -103,7 +103,7 @@ static void level_stats_print(struct seq_file *m, struct level_stats *stats) 
	int i = 0;

	int64_t bucket_time = 0;

	char seqs[MAX_STR_LEN] = {0};

	int64_t s = stats->total_time;

	uint64_t s = stats->total_time;

	uint32_t ns = do_div(s, NSEC_PER_SEC);



	snprintf(seqs, MAX_STR_LEN,