Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel...

diff --cc drivers/cpufreq/amd-pstate.c
index 313550fa62d41e42b0de370c9c9e32d4f26f2bef,41d83dd50a710aa2a47f559ed01cf6264007810c..1839d3c4d0d50d1a85871322abb453db5db29882
--- 1/drivers/cpufreq/amd-pstate.c
--- 2/drivers/cpufreq/amd-pstate.c
+++ b/drivers/cpufreq/amd-pstate.c
@@@ -744,9 -744,9 +744,8 @@@ static int amd_pstate_set_boost(struct 
                pr_err("Boost mode is not supported by this processor or SBIOS\n");
                return -EOPNOTSUPP;
        }
-       guard(mutex)(&amd_pstate_driver_lock);
  
        ret = amd_pstate_cpu_boost_update(policy, state);
 -      policy->boost_enabled = !ret ? state : false;
        refresh_frequency_limits(policy);
  
        return ret;

diff --cc drivers/cpufreq/cpufreq.c
Simple merge

diff --cc include/linux/cpufreq.h
Simple merge