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

Commit 63351df8 authored by Ruchi Kandoi's avatar Ruchi Kandoi
Browse files

Fix compile errors in accordance with changes from 3.14 to 3.18 



Signed-off-by: default avatarRuchi <Kandoi&lt;kandoiruchi@google.com>
parent 3d3c5e9e

drivers/cpufreq/cpufreq_interactive.c

+4 −4
Original line number Diff line number Diff line
@@ -808,7 +808,7 @@ static ssize_t store_hispeed_freq(struct cpufreq_interactive_tunables *tunables, 
	int ret;

	long unsigned int val;



	ret = strict_strtoul(buf, 0, &val);

	ret = kstrtoul(buf, 0, &val);

	if (ret < 0)

		return ret;

	tunables->hispeed_freq = val;
@@ -827,7 +827,7 @@ static ssize_t store_go_hispeed_load(struct cpufreq_interactive_tunables 
	int ret;

	unsigned long val;



	ret = strict_strtoul(buf, 0, &val);

	ret = kstrtoul(buf, 0, &val);

	if (ret < 0)

		return ret;

	tunables->go_hispeed_load = val;
@@ -846,7 +846,7 @@ static ssize_t store_min_sample_time(struct cpufreq_interactive_tunables 
	int ret;

	unsigned long val;



	ret = strict_strtoul(buf, 0, &val);

	ret = kstrtoul(buf, 0, &val);

	if (ret < 0)

		return ret;

	tunables->min_sample_time = val;
@@ -865,7 +865,7 @@ static ssize_t store_timer_rate(struct cpufreq_interactive_tunables *tunables, 
	int ret;

	unsigned long val;



	ret = strict_strtoul(buf, 0, &val);

	ret = kstrtoul(buf, 0, &val);

	if (ret < 0)

		return ret;

	tunables->timer_rate = val;

drivers/cpufreq/cpufreq_stats.c

+2 −2
Original line number Diff line number Diff line
@@ -490,8 +490,8 @@ static int cpufreq_stat_notifier_policy(struct notifier_block *nb, 
		return 0;

	}



	if (!per_cpu(all_cpufreq_stats, cpu))

		cpufreq_allstats_create(cpu);

	if (!per_cpu(all_cpufreq_stats, policy->cpu))

		cpufreq_allstats_create(policy->cpu);



	if (val == CPUFREQ_CREATE_POLICY)

		ret = __cpufreq_stats_create_table(policy);

drivers/staging/android/fiq_debugger/fiq_debugger.c

+1 −1
Original line number Diff line number Diff line
@@ -517,7 +517,7 @@ static bool fiq_debugger_fiq_exec(struct fiq_debugger_state *state, 
		fiq_debugger_printf(&state->output, "cpu %d\n", state->current_cpu);

	} else if (!strncmp(cmd, "cpu ", 4)) {

		unsigned long cpu = 0;

		if (strict_strtoul(cmd + 4, 10, &cpu) == 0)

		if (kstrtoul(cmd + 4, 10, &cpu) == 0)

			fiq_debugger_switch_cpu(state, cpu);

		else

			fiq_debugger_printf(&state->output, "invalid cpu\n");

drivers/staging/android/lowmemorykiller.c

+2 −4
Original line number Diff line number Diff line
@@ -276,10 +276,8 @@ static const struct kparam_array __param_arr_adj = { 


module_param_named(cost, lowmem_shrinker.seeks, int, S_IRUGO | S_IWUSR);

#ifdef CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES

__module_param_call(MODULE_PARAM_PREFIX, adj,

		    &lowmem_adj_array_ops,

		    .arr = &__param_arr_adj,

		    S_IRUGO | S_IWUSR, -1);

module_param_cb(adj, &lowmem_adj_array_ops,

		.arr = &__param_arr_adj, S_IRUGO | S_IWUSR);

__MODULE_PARM_TYPE(adj, "array of short");

#else

module_param_array_named(adj, lowmem_adj, short, &lowmem_adj_size,

include/linux/nmi.h

+10 −0
Original line number Diff line number Diff line
@@ -48,13 +48,23 @@ static inline bool watchdog_hardlockup_detector_is_enabled(void) 
#ifdef arch_trigger_all_cpu_backtrace

static inline bool trigger_all_cpu_backtrace(void)

{

	#if defined(CONFIG_ARM)

	arch_trigger_all_cpu_backtrace();

	#else

	arch_trigger_all_cpu_backtrace(true);

	#endif



	return true;

}

static inline bool trigger_allbutself_cpu_backtrace(void)

{

	#if defined(CONFIG_ARM)

	arch_trigger_all_cpu_backtrace();

	#else

	arch_trigger_all_cpu_backtrace(false);

	#endif





	return true;

}

#else