[netfilter-cvslog] r3299 - trunk/nfsim/kernelenv/include

rusty at netfilter.org rusty at netfilter.org
Thu Nov 25 06:24:33 CET 2004


Author: rusty at netfilter.org
Date: 2004-11-25 06:24:33 +0100 (Thu, 25 Nov 2004)
New Revision: 3299

Modified:
   trunk/nfsim/kernelenv/include/kernelenv.h
Log:
Use barf() not assert, as it gives better output.
Implement xchg for ipt_recent.c


Modified: trunk/nfsim/kernelenv/include/kernelenv.h
===================================================================
--- trunk/nfsim/kernelenv/include/kernelenv.h	2004-11-25 05:23:31 UTC (rev 3298)
+++ trunk/nfsim/kernelenv/include/kernelenv.h	2004-11-25 05:24:33 UTC (rev 3299)
@@ -47,6 +47,9 @@
 #define barrier()
 #define mb()
 
+/* Put v in *ptr atomically and return old *ptr value. */
+#define xchg(ptr,v) ({ __typeof__(*ptr) __a, *__p = (ptr); __a = *__p; *__p = (v); __a; })
+
 #define __user
 
 #define unlikely(x) (x)
@@ -117,8 +120,8 @@
 
 #define schedule()
 
-#define BUG_ON(x) assert(!(x))
-#define BUG() assert(0)
+#define BUG_ON(x) do { if (x) barf("%s:%u", __FILE__, __LINE__); } while(0)
+#define BUG() BUG_ON(1)
 
 #define cli()
 #define sti()
@@ -141,7 +144,7 @@
 
 extern unsigned long num_physpages;
 
-
+extern void barf(const char *fmt, ...);
 #define panic barf
 
 /* kernel.h */




More information about the netfilter-cvslog mailing list