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

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

Merge branches 'bugzilla-14207' and 'idle' into release

parents 9f3a6284 6f6ef82c d306ebc2

drivers/acpi/processor_idle.c

+16 −12
Original line number Diff line number Diff line
@@ -880,12 +880,14 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev, 
		return(acpi_idle_enter_c1(dev, state));



	local_irq_disable();

	if (cx->entry_method != ACPI_CSTATE_FFH) {

		current_thread_info()->status &= ~TS_POLLING;

		/*

		 * TS_POLLING-cleared state must be visible before we test

		 * NEED_RESCHED:

		 */

		smp_mb();

	}



	if (unlikely(need_resched())) {

		current_thread_info()->status |= TS_POLLING;
@@ -965,12 +967,14 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev, 
	}



	local_irq_disable();

	if (cx->entry_method != ACPI_CSTATE_FFH) {

		current_thread_info()->status &= ~TS_POLLING;

		/*

		 * TS_POLLING-cleared state must be visible before we test

		 * NEED_RESCHED:

		 */

		smp_mb();

	}



	if (unlikely(need_resched())) {

		current_thread_info()->status |= TS_POLLING;

drivers/platform/x86/acer-wmi.c

+1 −1
Original line number Diff line number Diff line
@@ -934,7 +934,7 @@ static int __devinit acer_backlight_init(struct device *dev) 
	acer_backlight_device = bd;



	bd->props.power = FB_BLANK_UNBLANK;

	bd->props.brightness = max_brightness;

	bd->props.brightness = read_brightness(bd);

	bd->props.max_brightness = max_brightness;

	backlight_update_status(bd);

	return 0;