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
629cf6d7
Commit
629cf6d7
authored
Jun 23, 2007
by
Len Brown
Browse files
Options
Browse Files
Download
Plain Diff
Pull now into release branch
parents
75154f40
d5a3d32a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
9 deletions
+18
-9
drivers/acpi/processor_idle.c
drivers/acpi/processor_idle.c
+6
-4
drivers/acpi/thermal.c
drivers/acpi/thermal.c
+11
-4
drivers/acpi/utilities/utobject.c
drivers/acpi/utilities/utobject.c
+1
-1
No files found.
drivers/acpi/processor_idle.c
View file @
629cf6d7
...
@@ -332,16 +332,18 @@ static void acpi_processor_idle(void)
...
@@ -332,16 +332,18 @@ static void acpi_processor_idle(void)
int
sleep_ticks
=
0
;
int
sleep_ticks
=
0
;
u32
t1
,
t2
=
0
;
u32
t1
,
t2
=
0
;
pr
=
processors
[
smp_processor_id
()];
if
(
!
pr
)
return
;
/*
/*
* Interrupts must be disabled during bus mastering calculations and
* Interrupts must be disabled during bus mastering calculations and
* for C2/C3 transitions.
* for C2/C3 transitions.
*/
*/
local_irq_disable
();
local_irq_disable
();
pr
=
processors
[
smp_processor_id
()];
if
(
!
pr
)
{
local_irq_enable
();
return
;
}
/*
/*
* Check whether we truly need to go idle, or should
* Check whether we truly need to go idle, or should
* reschedule:
* reschedule:
...
...
drivers/acpi/thermal.c
View file @
629cf6d7
...
@@ -828,6 +828,8 @@ static int acpi_thermal_trip_seq_show(struct seq_file *seq, void *offset)
...
@@ -828,6 +828,8 @@ static int acpi_thermal_trip_seq_show(struct seq_file *seq, void *offset)
{
{
struct
acpi_thermal
*
tz
=
seq
->
private
;
struct
acpi_thermal
*
tz
=
seq
->
private
;
struct
acpi_device
*
device
;
struct
acpi_device
*
device
;
acpi_status
status
;
int
i
=
0
;
int
i
=
0
;
int
j
=
0
;
int
j
=
0
;
...
@@ -850,8 +852,10 @@ static int acpi_thermal_trip_seq_show(struct seq_file *seq, void *offset)
...
@@ -850,8 +852,10 @@ static int acpi_thermal_trip_seq_show(struct seq_file *seq, void *offset)
tz
->
trips
.
passive
.
tc1
,
tz
->
trips
.
passive
.
tc2
,
tz
->
trips
.
passive
.
tc1
,
tz
->
trips
.
passive
.
tc2
,
tz
->
trips
.
passive
.
tsp
);
tz
->
trips
.
passive
.
tsp
);
for
(
j
=
0
;
j
<
tz
->
trips
.
passive
.
devices
.
count
;
j
++
)
{
for
(
j
=
0
;
j
<
tz
->
trips
.
passive
.
devices
.
count
;
j
++
)
{
acpi_bus_get_device
(
tz
->
trips
.
passive
.
devices
.
handles
[
j
],
&
device
);
status
=
acpi_bus_get_device
(
tz
->
trips
.
passive
.
devices
.
seq_printf
(
seq
,
"%4.4s "
,
acpi_device_bid
(
device
));
handles
[
j
],
&
device
);
seq_printf
(
seq
,
"%4.4s "
,
status
?
""
:
acpi_device_bid
(
device
));
}
}
seq_puts
(
seq
,
"
\n
"
);
seq_puts
(
seq
,
"
\n
"
);
}
}
...
@@ -863,8 +867,11 @@ static int acpi_thermal_trip_seq_show(struct seq_file *seq, void *offset)
...
@@ -863,8 +867,11 @@ static int acpi_thermal_trip_seq_show(struct seq_file *seq, void *offset)
i
,
i
,
KELVIN_TO_CELSIUS
(
tz
->
trips
.
active
[
i
].
temperature
));
KELVIN_TO_CELSIUS
(
tz
->
trips
.
active
[
i
].
temperature
));
for
(
j
=
0
;
j
<
tz
->
trips
.
active
[
i
].
devices
.
count
;
j
++
){
for
(
j
=
0
;
j
<
tz
->
trips
.
active
[
i
].
devices
.
count
;
j
++
){
acpi_bus_get_device
(
tz
->
trips
.
active
[
i
].
devices
.
handles
[
j
],
&
device
);
status
=
acpi_bus_get_device
(
tz
->
trips
.
active
[
i
].
seq_printf
(
seq
,
"%4.4s "
,
acpi_device_bid
(
device
));
devices
.
handles
[
j
],
&
device
);
seq_printf
(
seq
,
"%4.4s "
,
status
?
""
:
acpi_device_bid
(
device
));
}
}
seq_puts
(
seq
,
"
\n
"
);
seq_puts
(
seq
,
"
\n
"
);
}
}
...
...
drivers/acpi/utilities/utobject.c
View file @
629cf6d7
...
@@ -177,7 +177,7 @@ union acpi_operand_object *acpi_ut_create_package_object(u32 count)
...
@@ -177,7 +177,7 @@ union acpi_operand_object *acpi_ut_create_package_object(u32 count)
package_elements
=
ACPI_ALLOCATE_ZEROED
((
acpi_size
)
package_elements
=
ACPI_ALLOCATE_ZEROED
((
acpi_size
)
(
count
+
1
)
*
sizeof
(
void
*
));
(
count
+
1
)
*
sizeof
(
void
*
));
if
(
!
package_elements
)
{
if
(
!
package_elements
)
{
ACPI_FREE
(
package_desc
);
acpi_ut_remove_reference
(
package_desc
);
return_PTR
(
NULL
);
return_PTR
(
NULL
);
}
}
...
...
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