Merge tag 'v3.18-rc1' into x86/urgent

Reason:
Need to apply audit patch on top of v3.18-rc1.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/x86/kernel/apb_timer.c b/arch/x86/kernel/apb_timer.c
index af5b08ab3b71..5972b108f15a 100644
--- a/arch/x86/kernel/apb_timer.c
+++ b/arch/x86/kernel/apb_timer.c
@@ -146,7 +146,7 @@ static inline int is_apbt_capable(void)
 static int __init apbt_clockevent_register(void)
 {
         struct sfi_timer_table_entry *mtmr;
-        struct apbt_dev *adev = &__get_cpu_var(cpu_apbt_dev);
+        struct apbt_dev *adev = this_cpu_ptr(&cpu_apbt_dev);
 
         mtmr = sfi_get_mtmr(APBT_CLOCKEVENT0_NUM);
         if (mtmr == NULL) {
@@ -200,7 +200,7 @@ void apbt_setup_secondary_clock(void)
         if (!cpu)
                 return;
 
-        adev = &__get_cpu_var(cpu_apbt_dev);
+        adev = this_cpu_ptr(&cpu_apbt_dev);
         if (!adev->timer) {
                 adev->timer = dw_apb_clockevent_init(cpu, adev->name,
                         APBT_CLOCKEVENT_RATING, adev_virt_addr(adev),