aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2014-03-05 14:49:35 +0800
committerAlex Shi <alex.shi@linaro.org>2014-03-10 13:38:37 +0800
commit797bca32b8f2ba6cf4aa9ad19f0ba1580d7bd9a4 (patch)
tree6b1584c4d2c06cf182f1c74c82b99846b0428b76
parent1447ced2fb88eb2d7fa7df79f156569ffaa97913 (diff)
downloadlinux-linaro-stable-797bca32b8f2ba6cf4aa9ad19f0ba1580d7bd9a4.tar.gz
arm64: hw_breakpoint compile error fixing
When backport commit, arm64: kernel: implement HW breakpoints CPU PM notifier We have the following compile error, that is due to on 3.10, we still need to use __get_cpu_var instead of this_cpu_ptr. This patch is to fix it. arch/arm64/kernel/hw_breakpoint.c: In function ‘hw_breakpoint_reset’: arch/arm64/kernel/hw_breakpoint.c:864:15: error: cast specifies array type arch/arm64/kernel/hw_breakpoint.c:873:15: error: cast specifies array type make[1]: *** [arch/arm64/kernel/hw_breakpoint.o] Error 1 Signed-off-by: Alex Shi <alex.shi@linaro.org>
-rw-r--r--arch/arm64/kernel/hw_breakpoint.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/kernel/hw_breakpoint.c b/arch/arm64/kernel/hw_breakpoint.c
index 83409c6261e7..f3f879388d22 100644
--- a/arch/arm64/kernel/hw_breakpoint.c
+++ b/arch/arm64/kernel/hw_breakpoint.c
@@ -861,7 +861,7 @@ static void hw_breakpoint_reset(void *unused)
* notifier some slots might be initialized; if so they are
* reprogrammed according to the debug slots content.
*/
- for (slots = this_cpu_ptr(bp_on_reg), i = 0; i < core_num_brps; ++i) {
+ for (slots = __get_cpu_var(bp_on_reg), i = 0; i < core_num_brps; ++i) {
if (slots[i]) {
hw_breakpoint_control(slots[i], HW_BREAKPOINT_RESTORE);
} else {
@@ -870,7 +870,7 @@ static void hw_breakpoint_reset(void *unused)
}
}
- for (slots = this_cpu_ptr(wp_on_reg), i = 0; i < core_num_wrps; ++i) {
+ for (slots = __get_cpu_var(wp_on_reg), i = 0; i < core_num_wrps; ++i) {
if (slots[i]) {
hw_breakpoint_control(slots[i], HW_BREAKPOINT_RESTORE);
} else {