arm64: hw_breakpoint compile error fixing
authorAlex Shi <alex.shi@linaro.org>
Wed, 5 Mar 2014 06:49:35 +0000 (14:49 +0800)
committerAlex Shi <alex.shi@linaro.org>
Mon, 10 Mar 2014 05:38:37 +0000 (13:38 +0800)
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>
arch/arm64/kernel/hw_breakpoint.c

index 83409c6261e704c6a1fd52404514cd3b7b076bf4..f3f879388d2293347f36ea53446fd6514cce6387 100644 (file)
@@ -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 {