Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
defa0c6b
Commit
defa0c6b
authored
Dec 15, 2020
by
Rafael J. Wysocki
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'acpi-processor' to satisfy dependencies
parents
30c76882
bca3e43c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
drivers/acpi/cppc_acpi.c
drivers/acpi/cppc_acpi.c
+1
-1
drivers/acpi/processor_perflib.c
drivers/acpi/processor_perflib.c
+1
-2
No files found.
drivers/acpi/cppc_acpi.c
View file @
defa0c6b
...
...
@@ -511,7 +511,7 @@ int acpi_get_psd_map(struct cppc_cpudata **all_cpu_data)
/* Assume no coordination on any error parsing domain info */
cpumask_clear
(
pr
->
shared_cpu_map
);
cpumask_set_cpu
(
i
,
pr
->
shared_cpu_map
);
pr
->
shared_type
=
CPUFREQ_SHARED_TYPE_
ALL
;
pr
->
shared_type
=
CPUFREQ_SHARED_TYPE_
NONE
;
}
out:
free_cpumask_var
(
covered_cpus
);
...
...
drivers/acpi/processor_perflib.c
View file @
defa0c6b
...
...
@@ -616,7 +616,6 @@ int acpi_processor_preregister_performance(
continue
;
pr
->
performance
=
per_cpu_ptr
(
performance
,
i
);
cpumask_set_cpu
(
i
,
pr
->
performance
->
shared_cpu_map
);
pdomain
=
&
(
pr
->
performance
->
domain_info
);
if
(
acpi_processor_get_psd
(
pr
->
handle
,
pdomain
))
{
retval
=
-
EINVAL
;
...
...
@@ -710,7 +709,7 @@ int acpi_processor_preregister_performance(
if
(
retval
)
{
cpumask_clear
(
pr
->
performance
->
shared_cpu_map
);
cpumask_set_cpu
(
i
,
pr
->
performance
->
shared_cpu_map
);
pr
->
performance
->
shared_type
=
CPUFREQ_SHARED_TYPE_
ALL
;
pr
->
performance
->
shared_type
=
CPUFREQ_SHARED_TYPE_
NONE
;
}
pr
->
performance
=
NULL
;
/* Will be set for real in register */
}
...
...
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