wrapper: remove percpu-defs.h wrapper

[lttng-modules.git] / lttng-filter-interpreter.c

diff --git a/lttng-filter-interpreter.c b/lttng-filter-interpreter.c
index c7ce7d331bd2dc4eb8639751d7b38377ed451fca..1d09fdee26fb807d646f0836c14b1451f56469aa 100644 (file)
--- a/lttng-filter-interpreter.c
+++ b/lttng-filter-interpreter.c
@@ -7,15 +7,15 @@
  * Copyright (C) 2010-2016 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#include <wrapper/uaccess.h>
-#include <wrapper/frame.h>
+#include <linux/uaccess.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
@@ -30,8 +30,7 @@ char get_char(struct estack_entry *reg, size_t offset)
                char c;
 
                /* Handle invalid access as end of string. */
-               if (unlikely(!lttng_access_ok(VERIFY_READ,
-                               reg->u.s.user_str + offset,
+               if (unlikely(!access_ok(reg->u.s.user_str + offset,
                                sizeof(c))))
                        return '\0';
                /* Handle fault (nonzero return value) as end of string. */