From 9d4afa49b16eecc520f8e68b73b663418575cef1 Mon Sep 17 00:00:00 2001
From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Mon, 13 Apr 2020 14:18:51 -0400
Subject: [PATCH] wrapper: remove frame.h wrapper

---
 lttng-filter-interpreter.c |  4 ++--
 wrapper/frame.h            | 26 --------------------------
 2 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100644 wrapper/frame.h

diff --git a/lttng-filter-interpreter.c b/lttng-filter-interpreter.c
index 811a2622..1d09fdee 100644
--- a/lttng-filter-interpreter.c
+++ b/lttng-filter-interpreter.c
@@ -8,14 +8,14 @@
  */
 
 #include <linux/uaccess.h>
-#include <wrapper/frame.h>
+#include <linux/frame.h>
 #include <wrapper/types.h>
 #include <linux/swab.h>
 
 #include <lttng-filter.h>
 #include <lttng-string-utils.h>
 
-LTTNG_STACK_FRAME_NON_STANDARD(lttng_filter_interpret_bytecode);
+STACK_FRAME_NON_STANDARD(lttng_filter_interpret_bytecode);
 
 /*
  * get_char should be called with page fault handler disabled if it is expected
diff --git a/wrapper/frame.h b/wrapper/frame.h
deleted file mode 100644
index 9c9c7d88..00000000
--- a/wrapper/frame.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
- *
- * wrapper/frame.h
- *
- * Copyright (C) 2016 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- */
-
-#ifndef _LTTNG_WRAPPER_FRAME_H
-#define _LTTNG_WRAPPER_FRAME_H
-
-#include <linux/version.h>
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0))
-
-#include <linux/frame.h>
-
-#define LTTNG_STACK_FRAME_NON_STANDARD(func) \
-	STACK_FRAME_NON_STANDARD(func)
-
-#else
-
-#define LTTNG_STACK_FRAME_NON_STANDARD(func)
-
-#endif
-
-#endif /* _LTTNG_WRAPPER_FRAME_H */
-- 
2.34.1