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

Commit 530bc23b authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'i7300_idle' into test

parents ead90393 27471fdb

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -2078,6 +2078,12 @@ L: linux-ide@vger.kernel.org 
L:	linux-scsi@vger.kernel.org

S:	Orphan



IDLE-I7300

P:	Andy Henroid

M:	andrew.d.henroid@intel.com

L:	linux-pm@lists.linux-foundation.org

S:	Supported



IEEE 1394 SUBSYSTEM (drivers/ieee1394)

P:	Ben Collins

M:	ben.collins@ubuntu.com

arch/x86/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -1539,6 +1539,8 @@ source "arch/x86/kernel/cpu/cpufreq/Kconfig" 


source "drivers/cpuidle/Kconfig"



source "drivers/idle/Kconfig"



endmenu

arch/x86/kernel/process_64.c

+7 −0
Original line number Diff line number Diff line
@@ -62,6 +62,13 @@ void idle_notifier_register(struct notifier_block *n) 
{

	atomic_notifier_chain_register(&idle_notifier, n);

}

EXPORT_SYMBOL_GPL(idle_notifier_register);



void idle_notifier_unregister(struct notifier_block *n)

{

	atomic_notifier_chain_unregister(&idle_notifier, n);

}

EXPORT_SYMBOL_GPL(idle_notifier_unregister);



void enter_idle(void)

{

drivers/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ obj-$(CONFIG_EISA) += eisa/ 
obj-y				+= lguest/

obj-$(CONFIG_CPU_FREQ)		+= cpufreq/

obj-$(CONFIG_CPU_IDLE)		+= cpuidle/

obj-y				+= idle/

obj-$(CONFIG_MMC)		+= mmc/

obj-$(CONFIG_MEMSTICK)		+= memstick/

obj-$(CONFIG_NEW_LEDS)		+= leds/

drivers/dma/ioat_dma.c

+3 −0
Original line number Diff line number Diff line
@@ -171,6 +171,9 @@ static int ioat_dma_enumerate_channels(struct ioatdma_device *device) 
	xfercap_scale = readb(device->reg_base + IOAT_XFERCAP_OFFSET);

	xfercap = (xfercap_scale == 0 ? -1 : (1UL << xfercap_scale));



#if CONFIG_I7300_IDLE_IOAT_CHANNEL

	device->common.chancnt--;

#endif

	for (i = 0; i < device->common.chancnt; i++) {

		ioat_chan = kzalloc(sizeof(*ioat_chan), GFP_KERNEL);

		if (!ioat_chan) {