From mboxrd@z Thu Jan 1 00:00:00 1970 From: mathieu.desnoyers@efficios.com (Mathieu Desnoyers) Date: Wed, 30 Nov 2011 13:34:24 -0500 Subject: [lttng-dev] [PATCH 11/15] lttng: remove raw spinlock wrapper In-Reply-To: <1322678068-5255-1-git-send-email-mathieu.desnoyers@efficios.com> References: <1322678068-5255-1-git-send-email-mathieu.desnoyers@efficios.com> Message-ID: <1322678068-5255-12-git-send-email-mathieu.desnoyers@efficios.com> Now that LTTng is in the kernel tree, we don't need to support deprecated APIs from older kernels. Signed-off-by: Mathieu Desnoyers --- .../staging/lttng/lib/ringbuffer/frontend_types.h | 1 - drivers/staging/lttng/wrapper/spinlock.h | 26 -------------------- 2 files changed, 0 insertions(+), 27 deletions(-) delete mode 100644 drivers/staging/lttng/wrapper/spinlock.h diff --git a/drivers/staging/lttng/lib/ringbuffer/frontend_types.h b/drivers/staging/lttng/lib/ringbuffer/frontend_types.h index 5c7437f..00b4552 100644 --- a/drivers/staging/lttng/lib/ringbuffer/frontend_types.h +++ b/drivers/staging/lttng/lib/ringbuffer/frontend_types.h @@ -19,7 +19,6 @@ #include #include "../../wrapper/ringbuffer/config.h" #include "../../wrapper/ringbuffer/backend_types.h" -#include "../../wrapper/spinlock.h" #include "../../lib/prio_heap/lttng_prio_heap.h" /* For per-CPU read-side iterator */ /* diff --git a/drivers/staging/lttng/wrapper/spinlock.h b/drivers/staging/lttng/wrapper/spinlock.h deleted file mode 100644 index 8b1ad99..0000000 --- a/drivers/staging/lttng/wrapper/spinlock.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef _LTT_WRAPPER_SPINLOCK_H -#define _LTT_WRAPPER_SPINLOCK_H - -/* - * Copyright (C) 2011 Mathieu Desnoyers (mathieu.desnoyers at efficios.com) - * - * Dual LGPL v2.1/GPL v2 license. - */ - -#include - -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)) - -#include - -#define raw_spin_lock_init(lock) \ - do { \ - raw_spinlock_t __lock = __RAW_SPIN_LOCK_UNLOCKED; \ - memcpy(lock, &__lock, sizeof(lock)); \ - } while (0) - -#define raw_spin_is_locked(lock) __raw_spin_is_locked(lock) - - -#endif -#endif /* _LTT_WRAPPER_SPINLOCK_H */ -- 1.7.5.4