From 46e25482873e8c85b547db4cec1734f127b27488 Mon Sep 17 00:00:00 2001
From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Mon, 13 Apr 2020 14:24:16 -0400
Subject: [PATCH] wrapper: remove percpu-defs.h wrapper

---
 lib/ringbuffer/frontend_api.h         |  4 ++--
 lib/ringbuffer/ring_buffer_frontend.c | 10 ++++-----
 wrapper/percpu-defs.h                 | 29 ---------------------------
 wrapper/trace-clock.h                 |  4 ++--
 4 files changed, 9 insertions(+), 38 deletions(-)
 delete mode 100644 wrapper/percpu-defs.h

diff --git a/lib/ringbuffer/frontend_api.h b/lib/ringbuffer/frontend_api.h
index 3c46a177..db2235b9 100644
--- a/lib/ringbuffer/frontend_api.h
+++ b/lib/ringbuffer/frontend_api.h
@@ -14,9 +14,9 @@
 #define _LIB_RING_BUFFER_FRONTEND_API_H
 
 #include <wrapper/ringbuffer/frontend.h>
-#include <wrapper/percpu-defs.h>
 #include <linux/errno.h>
 #include <linux/prefetch.h>
+#include <linux/percpu-defs.h>
 
 /**
  * lib_ring_buffer_get_cpu - Precedes ring buffer reserve/commit.
@@ -58,7 +58,7 @@ static inline
 void lib_ring_buffer_put_cpu(const struct lib_ring_buffer_config *config)
 {
 	barrier();
-	(*lttng_this_cpu_ptr(&lib_ring_buffer_nesting))--;
+	(*this_cpu_ptr(&lib_ring_buffer_nesting))--;
 	rcu_read_unlock_sched_notrace();
 }
 
diff --git a/lib/ringbuffer/ring_buffer_frontend.c b/lib/ringbuffer/ring_buffer_frontend.c
index 664e8652..8c9e5ef7 100644
--- a/lib/ringbuffer/ring_buffer_frontend.c
+++ b/lib/ringbuffer/ring_buffer_frontend.c
@@ -41,6 +41,7 @@
 #include <linux/module.h>
 #include <linux/percpu.h>
 #include <linux/kref.h>
+#include <linux/percpu-defs.h>
 #include <asm/cacheflush.h>
 
 #include <wrapper/ringbuffer/config.h>
@@ -49,7 +50,6 @@
 #include <wrapper/ringbuffer/iterator.h>
 #include <wrapper/ringbuffer/nohz.h>
 #include <wrapper/atomic.h>
-#include <wrapper/percpu-defs.h>
 #include <wrapper/timer.h>
 
 /*
@@ -633,16 +633,16 @@ static int notrace ring_buffer_tick_nohz_callback(struct notifier_block *nb,
 		raw_spin_unlock(&buf->raw_tick_nohz_spinlock);
 		break;
 	case TICK_NOHZ_STOP:
-		spin_lock(lttng_this_cpu_ptr(&ring_buffer_nohz_lock));
+		spin_lock(this_cpu_ptr(&ring_buffer_nohz_lock));
 		lib_ring_buffer_stop_switch_timer(buf);
 		lib_ring_buffer_stop_read_timer(buf);
-		spin_unlock(lttng_this_cpu_ptr(&ring_buffer_nohz_lock));
+		spin_unlock(this_cpu_ptr(&ring_buffer_nohz_lock));
 		break;
 	case TICK_NOHZ_RESTART:
-		spin_lock(lttng_this_cpu_ptr(&ring_buffer_nohz_lock));
+		spin_lock(this_cpu_ptr(&ring_buffer_nohz_lock));
 		lib_ring_buffer_start_read_timer(buf);
 		lib_ring_buffer_start_switch_timer(buf);
-		spin_unlock(lttng_this_cpu_ptr(&ring_buffer_nohz_lock));
+		spin_unlock(this_cpu_ptr(&ring_buffer_nohz_lock));
 		break;
 	}
 
diff --git a/wrapper/percpu-defs.h b/wrapper/percpu-defs.h
deleted file mode 100644
index fff8b1df..00000000
--- a/wrapper/percpu-defs.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
- *
- * wrapper/percpu-defs.h
- *
- * wrapper around linux/percpu-defs.h.
- *
- * Copyright (C) 2014 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- */
-
-#ifndef _LTTNG_WRAPPER_PERCPU_DEFS_H
-#define _LTTNG_WRAPPER_PERCPU_DEFS_H
-
-#include <linux/version.h>
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)
-
-#include <linux/percpu-defs.h>
-
-#define lttng_this_cpu_ptr(ptr)		this_cpu_ptr(ptr)
-
-#else /* #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0) */
-
-#include <linux/percpu.h>
-
-#define lttng_this_cpu_ptr(ptr)		(&__get_cpu_var(*(ptr)))
-
-#endif /* #else #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0) */
-
-#endif /* _LTTNG_WRAPPER_PERCPU_DEFS_H */
diff --git a/wrapper/trace-clock.h b/wrapper/trace-clock.h
index a08c6a8b..c51f8d3c 100644
--- a/wrapper/trace-clock.h
+++ b/wrapper/trace-clock.h
@@ -21,11 +21,11 @@
 #include <linux/hrtimer.h>
 #include <linux/percpu.h>
 #include <linux/version.h>
+#include <linux/percpu-defs.h>
 #include <asm/local.h>
 #include <lttng-kernel-version.h>
 #include <lttng-clock.h>
 #include <wrapper/compiler.h>
-#include <wrapper/percpu-defs.h>
 #include <wrapper/random.h>
 #include <blacklist/timekeeping.h>
 
@@ -71,7 +71,7 @@ static inline u64 trace_clock_monotonic_wrapper(void)
 
 	/* Use fast nmi-safe monotonic clock provided by the Linux kernel. */
 	preempt_disable();
-	last_tsc_ptr = lttng_this_cpu_ptr(&lttng_last_tsc);
+	last_tsc_ptr = this_cpu_ptr(&lttng_last_tsc);
 	last = *last_tsc_ptr;
 	/*
 	 * Read "last" before "now". It is not strictly required, but it ensures
-- 
2.34.1