Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 361198
b: refs/heads/master
c: c705c78
h: refs/heads/master
v: v3
  • Loading branch information
Konrad Rzeszutek Wilk committed Mar 6, 2013
1 parent 704b504 commit e40479f
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bdc5c1812cea6efe1aaefb3131fcba28cd0b2b68
refs/heads/master: c705c78c0d0835a4aa5d0d9a3422e3218462030c
4 changes: 2 additions & 2 deletions trunk/drivers/acpi/processor_perflib.c
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ static int acpi_processor_get_performance_states(struct acpi_processor *pr)
return result;
}

static int acpi_processor_get_performance_info(struct acpi_processor *pr)
int acpi_processor_get_performance_info(struct acpi_processor *pr)
{
int result = 0;
acpi_status status = AE_OK;
Expand Down Expand Up @@ -509,7 +509,7 @@ static int acpi_processor_get_performance_info(struct acpi_processor *pr)
#endif
return result;
}

EXPORT_SYMBOL_GPL(acpi_processor_get_performance_info);
int acpi_processor_notify_smm(struct module *calling_module)
{
acpi_status status;
Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/xen/xen-acpi-processor.c
Original file line number Diff line number Diff line change
Expand Up @@ -500,16 +500,16 @@ static int __init xen_acpi_processor_init(void)
(void)acpi_processor_preregister_performance(acpi_perf_data);

for_each_possible_cpu(i) {
struct acpi_processor *pr;
struct acpi_processor_performance *perf;

pr = per_cpu(processors, i);
perf = per_cpu_ptr(acpi_perf_data, i);
rc = acpi_processor_register_performance(perf, i);
pr->performance = perf;
rc = acpi_processor_get_performance_info(pr);
if (rc)
goto err_out;
}
rc = acpi_processor_notify_smm(THIS_MODULE);
if (rc)
goto err_unregister;

for_each_possible_cpu(i) {
struct acpi_processor *_pr;
Expand Down
3 changes: 3 additions & 0 deletions trunk/include/acpi/processor.h
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,9 @@ extern void acpi_processor_unregister_performance(struct
if a _PPC object exists, rmmod is disallowed then */
int acpi_processor_notify_smm(struct module *calling_module);

/* parsing the _P* objects. */
extern int acpi_processor_get_performance_info(struct acpi_processor *pr);

/* for communication between multiple parts of the processor kernel module */
DECLARE_PER_CPU(struct acpi_processor *, processors);
extern struct acpi_processor_errata errata;
Expand Down

0 comments on commit e40479f

Please sign in to comment.