git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...
[pandora-kernel.git]
/
drivers
/
acpi
/
processor_idle.c
diff --git
a/drivers/acpi/processor_idle.c
b/drivers/acpi/processor_idle.c
index
dcb38f8
..
a765b82
100644
(file)
--- a/
drivers/acpi/processor_idle.c
+++ b/
drivers/acpi/processor_idle.c
@@
-746,7
+746,7
@@
static int acpi_idle_enter_c1(struct cpuidle_device *dev,
struct acpi_processor *pr;
struct acpi_processor_cx *cx = cpuidle_get_statedata(state);
struct acpi_processor *pr;
struct acpi_processor_cx *cx = cpuidle_get_statedata(state);
- pr = __
get_cpu_var
(processors);
+ pr = __
this_cpu_read
(processors);
if (unlikely(!pr))
return 0;
if (unlikely(!pr))
return 0;
@@
-787,7
+787,7
@@
static int acpi_idle_enter_simple(struct cpuidle_device *dev,
s64 idle_time_ns;
s64 idle_time;
s64 idle_time_ns;
s64 idle_time;
- pr = __
get_cpu_var
(processors);
+ pr = __
this_cpu_read
(processors);
if (unlikely(!pr))
return 0;
if (unlikely(!pr))
return 0;
@@
-864,7
+864,7
@@
static int acpi_idle_enter_bm(struct cpuidle_device *dev,
s64 idle_time;
s64 idle_time;
- pr = __
get_cpu_var
(processors);
+ pr = __
this_cpu_read
(processors);
if (unlikely(!pr))
return 0;
if (unlikely(!pr))
return 0;