system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-27 23:10:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Len Brown 2010-02-23 00:19:48 -05:00
parent 9f3a628488 6f6ef82cc9 d306ebc286
commit e4f23f66ed
2 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
drivers/acpi/processor_idle.c
View file

@ -880,12 +880,14 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
return(acpi_idle_enter_c1(dev, state)); return(acpi_idle_enter_c1(dev, state));
local_irq_disable(); local_irq_disable();
current_thread_info()->status &= ~TS_POLLING; 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: * TS_POLLING-cleared state must be visible before we test
*/ * NEED_RESCHED:
smp_mb(); */
smp_mb();
}
if (unlikely(need_resched())) { if (unlikely(need_resched())) {
current_thread_info()->status |= TS_POLLING; current_thread_info()->status |= TS_POLLING;
@ -965,12 +967,14 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
} }
local_irq_disable(); local_irq_disable();
current_thread_info()->status &= ~TS_POLLING; 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: * TS_POLLING-cleared state must be visible before we test
*/ * NEED_RESCHED:
smp_mb(); */
smp_mb();
}
if (unlikely(need_resched())) { if (unlikely(need_resched())) {
current_thread_info()->status |= TS_POLLING; current_thread_info()->status |= TS_POLLING;

2
drivers/platform/x86/acer-wmi.c
View file

@ -934,7 +934,7 @@ static int __devinit acer_backlight_init(struct device *dev)
acer_backlight_device = bd; acer_backlight_device = bd;
bd->props.power = FB_BLANK_UNBLANK; bd->props.power = FB_BLANK_UNBLANK;
bd->props.brightness = max_brightness; bd->props.brightness = read_brightness(bd);
bd->props.max_brightness = max_brightness; bd->props.max_brightness = max_brightness;
backlight_update_status(bd); backlight_update_status(bd);
return 0; return 0;