Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:26:04 UTC 2021
Modified Files:
src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.h
Log Message:
Don't redefine stuff that common now has
Preferring common to avoid licensing mish-mash
Author: Maya Rashish <m...@netbsd.org>
Committer: Taylor R Campbell <riastr...@netbsd.org>
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 \
src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h
diff -u src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.17 src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.18
--- src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.17 Sat Sep 26 12:58:22 2020
+++ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h Sun Dec 19 11:26:04 2021
@@ -173,47 +173,6 @@ void
device_rlprintf(int pps, device_t dev, const char *fmt, ...)
__printflike(3, 4);
-#define might_sleep()
-
-#define WARN(condition, msg) \
-({ \
- int __ret_warn_on = !!(condition); \
- if (unlikely(__ret_warn_on)) \
- printf((msg)); \
- unlikely(__ret_warn_on); \
-})
-
-
-
-#define WARN_ON(condition) \
-({ \
- int __ret_warn_on = !!(condition); \
- if (unlikely(__ret_warn_on)) \
- printf("WARN_ON: " #condition "\n"); \
- unlikely(__ret_warn_on); \
-})
-
-#define WARN_ON_ONCE(condition) ({ \
- static int __warned; \
- int __ret_warn_once = !!(condition); \
- \
- if (unlikely(__ret_warn_once)) \
- if (WARN_ON(!__warned)) \
- __warned = 1; \
- unlikely(__ret_warn_once); \
-})
-
-#define BUG_ON(cond) \
- do { \
- if (cond) \
- panic("BUG_ON: " #cond); \
- } while (0)
-
-#define BUG() \
- do { \
- panic("BUG: %s:%d", __FILE__, __LINE__); \
- } while (0)
-
#define vchiq_static_assert(cond) CTASSERT(cond)
/*
@@ -293,7 +252,6 @@ int fatal_signal_pending(VCHIQ_THREAD_T)
#define __user
#define current curlwp
-#define EXPORT_SYMBOL(x)
#define PAGE_ALIGN(addr) round_page(addr)
typedef void irqreturn_t;
