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

Commit de85871a authored by Len Brown's avatar Len Brown
Browse files

Pull cpuidle into test branch

parents 731aa5fd e196441b

arch/i386/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -1069,6 +1069,8 @@ endif # APM 


source "arch/i386/kernel/cpu/cpufreq/Kconfig"



source "drivers/cpuidle/Kconfig"



endmenu



menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)"

arch/x86_64/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -706,6 +706,8 @@ source "drivers/acpi/Kconfig" 


source "arch/x86_64/kernel/cpufreq/Kconfig"



source "drivers/cpuidle/Kconfig"



endmenu



menu "Bus options (PCI etc.)"

drivers/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ obj-$(CONFIG_MCA) += mca/ 
obj-$(CONFIG_EISA)		+= eisa/

obj-$(CONFIG_LGUEST_GUEST)	+= lguest/

obj-$(CONFIG_CPU_FREQ)		+= cpufreq/

obj-$(CONFIG_CPU_IDLE)		+= cpuidle/

obj-$(CONFIG_MMC)		+= mmc/

obj-$(CONFIG_NEW_LEDS)		+= leds/

obj-$(CONFIG_INFINIBAND)	+= infiniband/

drivers/acpi/osl.c

+0 −8
Original line number Diff line number Diff line
@@ -1042,14 +1042,6 @@ static int __init acpi_wake_gpes_always_on_setup(char *str) 


__setup("acpi_wake_gpes_always_on", acpi_wake_gpes_always_on_setup);



/*

 * max_cstate is defined in the base kernel so modules can

 * change it w/o depending on the state of the processor module.

 */

unsigned int max_cstate = ACPI_PROCESSOR_MAX_POWER;



EXPORT_SYMBOL(max_cstate);



/*

 * Acquire a spinlock.

 *

drivers/acpi/processor_core.c

+17 −5
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#include <linux/seq_file.h>

#include <linux/dmi.h>

#include <linux/moduleparam.h>

#include <linux/cpuidle.h>



#include <asm/io.h>

#include <asm/system.h>
@@ -1049,11 +1050,13 @@ static int __init acpi_processor_init(void) 
		return -ENOMEM;

	acpi_processor_dir->owner = THIS_MODULE;



	result = cpuidle_register_driver(&acpi_idle_driver);

	if (result < 0)

		goto out_proc;



	result = acpi_bus_register_driver(&acpi_processor_driver);

	if (result < 0) {

		remove_proc_entry(ACPI_PROCESSOR_CLASS, acpi_root_dir);

		return result;

	}

	if (result < 0)

		goto out_cpuidle;



	acpi_processor_install_hotplug_notify();
@@ -1062,11 +1065,18 @@ static int __init acpi_processor_init(void) 
	acpi_processor_ppc_init();



	return 0;



out_cpuidle:

	cpuidle_unregister_driver(&acpi_idle_driver);



out_proc:

	remove_proc_entry(ACPI_PROCESSOR_CLASS, acpi_root_dir);



	return result;

}



static void __exit acpi_processor_exit(void)

{



	acpi_processor_ppc_exit();



	acpi_thermal_cpufreq_exit();
@@ -1075,6 +1085,8 @@ static void __exit acpi_processor_exit(void) 


	acpi_bus_unregister_driver(&acpi_processor_driver);



	cpuidle_unregister_driver(&acpi_idle_driver);



	remove_proc_entry(ACPI_PROCESSOR_CLASS, acpi_root_dir);



	return;