diff options
author | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 15:57:27 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 16:02:14 +0200 |
commit | 71f6424023cb9fa381efc7237ca05926b2b1ca9a (patch) | |
tree | 6c3c4a2110d0ff3d73c4bacaddb23b9295663695 /drivers/xen/xen-acpi-processor.c | |
parent | 9bc128e16bb82c046d6972171de572affc5c4cbf (diff) | |
parent | e933a1a12a02f42e0013cda87bba37ccb59efc47 (diff) |
Merge branch 'mxs/cleanup' into next/multiplatform
This is a dependency for mxs/multiplatform
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Conflicts:
drivers/clocksource/Makefile
Diffstat (limited to 'drivers/xen/xen-acpi-processor.c')
-rw-r--r-- | drivers/xen/xen-acpi-processor.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/xen/xen-acpi-processor.c b/drivers/xen/xen-acpi-processor.c index f3278a6603c..90e34ac7e52 100644 --- a/drivers/xen/xen-acpi-processor.c +++ b/drivers/xen/xen-acpi-processor.c @@ -505,6 +505,9 @@ static int __init xen_acpi_processor_init(void) pr = per_cpu(processors, i); perf = per_cpu_ptr(acpi_perf_data, i); + if (!pr) + continue; + pr->performance = perf; rc = acpi_processor_get_performance_info(pr); if (rc) |