arm: dts: rockchip: rk3288-android delete rk timer

[firefly-linux-kernel-4.4.55.git] / arch / x86 / xen / multicalls.c

diff --git a/arch/x86/xen/multicalls.c b/arch/x86/xen/multicalls.c
index 0d82003e76adab8afe2ef3848f0c4384cd99601e..ea54a08d83012dce01f542e46cbaf453a0881ba5 100644 (file)
--- a/arch/x86/xen/multicalls.c
+++ b/arch/x86/xen/multicalls.c
@@ -54,7 +54,7 @@ DEFINE_PER_CPU(unsigned long, xen_mc_irq_flags);
 
 void xen_mc_flush(void)
 {
-       struct mc_buffer *b = &__get_cpu_var(mc_buffer);
+       struct mc_buffer *b = this_cpu_ptr(&mc_buffer);
        struct multicall_entry *mc;
        int ret = 0;
        unsigned long flags;
@@ -131,7 +131,7 @@ void xen_mc_flush(void)
 
 struct multicall_space __xen_mc_entry(size_t args)
 {
-       struct mc_buffer *b = &__get_cpu_var(mc_buffer);
+       struct mc_buffer *b = this_cpu_ptr(&mc_buffer);
        struct multicall_space ret;
        unsigned argidx = roundup(b->argidx, sizeof(u64));
 
@@ -162,7 +162,7 @@ struct multicall_space __xen_mc_entry(size_t args)
 
 struct multicall_space xen_mc_extend_args(unsigned long op, size_t size)
 {
-       struct mc_buffer *b = &__get_cpu_var(mc_buffer);
+       struct mc_buffer *b = this_cpu_ptr(&mc_buffer);
        struct multicall_space ret = { NULL, NULL };
 
        BUG_ON(preemptible());
@@ -192,7 +192,7 @@ out:
 
 void xen_mc_callback(void (*fn)(void *), void *data)
 {
-       struct mc_buffer *b = &__get_cpu_var(mc_buffer);
+       struct mc_buffer *b = this_cpu_ptr(&mc_buffer);
        struct callback *cb;
 
        if (b->cbidx == MC_BATCH) {