Re: Fix quilt merge error in acpi-cpufreq.c

[Ali Gholami Rudi]

Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote:
> diff --git a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
> index 837c2c4..ecdb682 100644
> --- a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
> +++ b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
> @@ -204,7 +204,13 @@ static void drv_read(struct drv_cmd *cmd)
>  
>  static void drv_write(struct drv_cmd *cmd)
>  {
> +	int this_cpu;
> +
> +	this_cpu = get_cpu();
> +	if (cpumask_test_cpu(this_cpu, cmd->mask))
> +		do_drv_write(cmd);
>  	smp_call_function_many(cmd->mask, do_drv_write, cmd, 1);
> +	put_cpu();
>  }
>  
>  static u32 get_cur_val(const struct cpumask *mask)

Tested it and works.

Regards,
Ali
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/