summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlejandro Colomar <alx.manpages@gmail.com>2021-11-19 20:10:46 +0100
committerAlejandro Colomar <alx.manpages@gmail.com>2021-11-20 14:45:33 +0100
commitf51e3d656990fe92017368e4649cced6b7aa1cc8 (patch)
tree75b30f6368d140332c92a5c190ef2b0a8ed27ac1
parent99aa6a86fb21903efa3390c9e59b0f20f71ae082 (diff)
tools/testing/selftests/rcutorture/: Don't redefine container_of()
Signed-off-by: Alejandro Colomar <alx.manpages@gmail.com>
-rw-r--r--tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/misc.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/misc.h b/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/misc.h
index aca50030f954..62369cdcde99 100644
--- a/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/misc.h
+++ b/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/misc.h
@@ -1,12 +1,15 @@
#ifndef MISC_H
#define MISC_H
+
#include "assume.h"
#include "int_typedefs.h"
#include "locks.h"
+#include <linux/container_of.h>
#include <linux/types.h>
+
/* Probably won't need to deal with bottom halves. */
static inline void local_bh_disable(void) {}
static inline void local_bh_enable(void) {}
@@ -15,11 +18,6 @@ static inline void local_bh_enable(void) {}
#define module_param(...)
#define EXPORT_SYMBOL_GPL(x)
-#define container_of(ptr, type, member) ({ \
- const typeof(((type *)0)->member) *__mptr = (ptr); \
- (type *)((char *)__mptr - offsetof(type, member)); \
-})
-
#ifndef USE_SIMPLE_SYNC_SRCU
/* Abuse udelay to make sure that busy loops terminate. */
#define udelay(x) assume(0)