leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Power management fixes for v4.10-rc1

Browse Source 
- Prevent the acpi-cpufreq driver from crashing on exit by fixing
    a check against the __cpuhp_setup_state() return value and fix
    the kerneldoc description of that function to make it clear that
    it may return positive numbers on success too (Boris Ostrovsky).
 
  - Drop an incorrect __init annotation of a function in the
    s3c64xx cpufreq driver and fix a build warning generated (by
    older compilers) because of it (Arnd Bergmann).
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABCAAGBQJYW9x5AAoJEILEb/54YlRx1HQQAJnHi7cmS2rJadnKeXJoY1ob
 I6fjYLgF7+68I3z+zs2HV5IxMPzJstdIn93xnugB8LXFM7bvAB4KuAWG0dEP2JMZ
 HtyjXNlSmogXlpgj3EcAgTQqpCHKxkB4Y1j0wLBZARkV6S+/B7oWhNigQITacoZR
 ZAcTNAU9KlUy9WM4tLQ5LD7cwVWIRNlGDQXLarNLHgYnFXcjosAy6SbL0mS0UfIx
 6YS5Q5a/xKbeT4uEeQE7WutqempcVL2E0wnqZErmg/Be421C454TbAcq7y+nEq5C
 gfaq8EjZ9oFcM9yKi65qW2rFJwntF4LK9jZrDxm/oSssjgzpdnbCTk4WYqjx/Mio
 7fWQRPalEsVJBz5+KLgmte/UYm5IA1krwiJTFchKPq15FGlfx65RoN5FmW+bfSt2
 5o/fYLB+KMdH06sc+U9bCH9c5cx3XQzksTQ+MXUju/B5iBnxJETpbg4CIyyK2S/z
 cXwgrvKh7EgbPHGQjtptAUFIYRU/5IGH1OOlbeIsjJmCSxuvsLLpn2f74QnRr8jk
 XTGVikKaxyiA/HUxJkW2AAgqGsRXCkjpkLYCy6DnGuvKJT2L4xEaRWCRvhAOPhKS
 nGgdMvRII2l0zN5stfKNjvbM0gLYiedTsCqe5JF5uhaZlxYie5nnRkVkveek0U4c
 i5xb94AHPk33vrUDBwTE
 =5bie
 -----END PGP SIGNATURE-----

Merge tag 'pm-fixes-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull power management fixes from Rafael Wysocki:
 "They fix one bug introduced recently, a build warning and a kerneldoc
  function description.

  Specifics:

   - Prevent the acpi-cpufreq driver from crashing on exit by fixing a
     check against the __cpuhp_setup_state() return value and fix the
     kerneldoc description of that function to make it clear that it may
     return positive numbers on success too (Boris Ostrovsky)

   - Drop an incorrect __init annotation of a function in the s3c64xx
     cpufreq driver and fix a build warning generated (by older
     compilers) because of it (Arnd Bergmann)"

* tag 'pm-fixes-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  cpufreq: s3c64xx: remove incorrect __init annotation
  cpufreq: Remove CPU hotplug callbacks only if they were initialized
  CPU/hotplug: Clarify description of __cpuhp_setup_state() return value
This commit is contained in:
Linus Torvalds 2016-12-22 10:15:05 -08:00
commit 85ba70b6ce
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/cpufreq/acpi-cpufreq.c
View File

@ -930,7 +930,7 @@ static void __init acpi_cpufreq_boost_init(void)
static void acpi_cpufreq_boost_exit(void)
{
if (acpi_cpufreq_online >= 0)
if (acpi_cpufreq_online > 0)
cpuhp_remove_state_nocalls(acpi_cpufreq_online);
}

2
drivers/cpufreq/s3c64xx-cpufreq.c
View File

@ -107,7 +107,7 @@ static int s3c64xx_cpufreq_set_target(struct cpufreq_policy *policy,
}
#ifdef CONFIG_REGULATOR
static void __init s3c64xx_cpufreq_config_regulator(void)
static void s3c64xx_cpufreq_config_regulator(void)
{
int count, v, i, found;
struct cpufreq_frequency_table *freq;