Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
e4f23f66
Commit
e4f23f66
authored
Feb 23, 2010
by
Len Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge branches 'bugzilla-14207' and 'idle' into release
parents
9f3a6284
6f6ef82c
d306ebc2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
13 deletions
+17
-13
drivers/acpi/processor_idle.c
drivers/acpi/processor_idle.c
+16
-12
drivers/platform/x86/acer-wmi.c
drivers/platform/x86/acer-wmi.c
+1
-1
No files found.
drivers/acpi/processor_idle.c
View file @
e4f23f66
...
...
@@ -880,12 +880,14 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
return
(
acpi_idle_enter_c1
(
dev
,
state
));
local_irq_disable
();
current_thread_info
()
->
status
&=
~
TS_POLLING
;
/*
* TS_POLLING-cleared state must be visible before we test
* NEED_RESCHED:
*/
smp_mb
();
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
();
current_thread_info
()
->
status
&=
~
TS_POLLING
;
/*
* TS_POLLING-cleared state must be visible before we test
* NEED_RESCHED:
*/
smp_mb
();
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
View file @
e4f23f66
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment