ARM64: DTS: Add rk3399-firefly uart4 device, node as /dev/ttyS1

[firefly-linux-kernel-4.4.55.git] / arch / x86 / oprofile / nmi_int.c

diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
index 379e8bd0deeabf8bb1e839ea6bcb11f0bc1dd12b..1d2e6392f5faaf6f450cdfa598b9b2a734064962 100644 (file)
--- a/arch/x86/oprofile/nmi_int.c
+++ b/arch/x86/oprofile/nmi_int.c
@@ -64,11 +64,11 @@ u64 op_x86_get_ctrl(struct op_x86_model_spec const *model,
 static int profile_exceptions_notify(unsigned int val, struct pt_regs *regs)
 {
        if (ctr_running)
-               model->check_ctrs(regs, &__get_cpu_var(cpu_msrs));
+               model->check_ctrs(regs, this_cpu_ptr(&cpu_msrs));
        else if (!nmi_enabled)
                return NMI_DONE;
        else
-               model->stop(&__get_cpu_var(cpu_msrs));
+               model->stop(this_cpu_ptr(&cpu_msrs));
        return NMI_HANDLED;
 }
 
@@ -91,7 +91,7 @@ static void nmi_cpu_save_registers(struct op_msrs *msrs)
 
 static void nmi_cpu_start(void *dummy)
 {
-       struct op_msrs const *msrs = &__get_cpu_var(cpu_msrs);
+       struct op_msrs const *msrs = this_cpu_ptr(&cpu_msrs);
        if (!msrs->controls)
                WARN_ON_ONCE(1);
        else
@@ -111,7 +111,7 @@ static int nmi_start(void)
 
 static void nmi_cpu_stop(void *dummy)
 {
-       struct op_msrs const *msrs = &__get_cpu_var(cpu_msrs);
+       struct op_msrs const *msrs = this_cpu_ptr(&cpu_msrs);
        if (!msrs->controls)
                WARN_ON_ONCE(1);
        else