Auto-update from upstream (3e356b26) · Commits · e / devices / android_kernel_teracube_emerald

MAINTAINERS

+9 −0

Original line number	Diff line number	Diff line
		@@ -1636,6 +1636,15 @@ L: ldm-devel@lists.sourceforge.net
		W: http://ldm.sourceforge.net
		S: Maintained

		LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
		P: Eric Moore
		M: Eric.Moore@lsil.com
		M: support@lsil.com
		L: mpt_linux_developer@lsil.com
		L: linux-scsi@vger.kernel.org
		W: http://www.lsilogic.com/support
		S: Supported

		LSILOGIC/SYMBIOS/NCR 53C8XX and 53C1010 PCI-SCSI drivers
		P: Matthew Wilcox
		M: matthew@wil.cx

+1 −1

+2 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@
		# Rewritten to use lists instead of if-statements.
		#

		obj-$(CONFIG_PCI) += pci/ usb/
		obj-$(CONFIG_PCI) += pci/
		obj-$(CONFIG_PARISC) += parisc/
		obj-$(CONFIG_RAPIDIO) += rapidio/
		obj-y += video/
		@@ -49,6 +49,7 @@ obj-$(CONFIG_ATA_OVER_ETH) += block/aoe/
		obj-$(CONFIG_PARIDE) += block/paride/
		obj-$(CONFIG_TC) += tc/
		obj-$(CONFIG_USB) += usb/
		obj-$(CONFIG_PCI) += usb/
		obj-$(CONFIG_USB_GADGET) += usb/gadget/
		obj-$(CONFIG_GAMEPORT) += input/gameport/
		obj-$(CONFIG_INPUT) += input/

+15 −7

Original line number	Diff line number	Diff line
		@@ -169,14 +169,10 @@ acpi_processor_power_activate(struct acpi_processor *pr,

		static void acpi_safe_halt(void)
		{
		int polling = test_thread_flag(TIF_POLLING_NRFLAG);
		if (polling) {
		clear_thread_flag(TIF_POLLING_NRFLAG);
		smp_mb__after_clear_bit();
		}
		if (!need_resched())
		safe_halt();
		if (polling)
		set_thread_flag(TIF_POLLING_NRFLAG);
		}

		@@ -295,6 +291,16 @@ static void acpi_processor_idle(void)
		* ------
		* Invoke the current Cx state to put the processor to sleep.
		*/
		if (cx->type == ACPI_STATE_C2 \|\| cx->type == ACPI_STATE_C3) {
		clear_thread_flag(TIF_POLLING_NRFLAG);
		smp_mb__after_clear_bit();
		if (need_resched()) {
		set_thread_flag(TIF_POLLING_NRFLAG);
		local_irq_enable();
		return;
		}
		}

		switch (cx->type) {

		case ACPI_STATE_C1:
		@@ -327,6 +333,7 @@ static void acpi_processor_idle(void)
		t2 = inl(acpi_fadt.xpm_tmr_blk.address);
		/* Re-enable interrupts */
		local_irq_enable();
		set_thread_flag(TIF_POLLING_NRFLAG);
		/* Compute time (ticks) that we were actually asleep */
		sleep_ticks =
		ticks_elapsed(t1, t2) - cx->latency_ticks - C2_OVERHEAD;
		@@ -366,6 +373,7 @@ static void acpi_processor_idle(void)

		/* Re-enable interrupts */
		local_irq_enable();
		set_thread_flag(TIF_POLLING_NRFLAG);
		/* Compute time (ticks) that we were actually asleep */
		sleep_ticks =
		ticks_elapsed(t1, t2) - cx->latency_ticks - C3_OVERHEAD;

+2 −0