D23656.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D23656.diff
View Options

	Index: head/sys/sys/lock.h
	===================================================================
	--- head/sys/sys/lock.h
	+++ head/sys/sys/lock.h
	@@ -162,16 +162,6 @@

	#define lock_initialized(lo) ((lo)->lo_flags & LO_INITIALIZED)

	-/*
	- * Helpful macros for quickly coming up with assertions with informative
	- * panic messages.
	- */
	-#define MPASS(ex) MPASS4(ex, #ex, __FILE__, __LINE__)
	-#define MPASS2(ex, what) MPASS4(ex, what, __FILE__, __LINE__)
	-#define MPASS3(ex, file, line) MPASS4(ex, #ex, file, line)
	-#define MPASS4(ex, what, file, line) \
	- KASSERT((ex), ("Assertion %s failed at %s:%d", what, file, line))
	-
	extern struct lock_class lock_class_mtx_sleep;
	extern struct lock_class lock_class_mtx_spin;
	extern struct lock_class lock_class_sx;
	Index: head/sys/sys/systm.h
	===================================================================
	--- head/sys/sys/systm.h
	+++ head/sys/sys/systm.h
	@@ -142,6 +142,16 @@
	#endif

	/*
	+ * Helpful macros for quickly coming up with assertions with informative
	+ * panic messages.
	+ */
	+#define MPASS(ex) MPASS4(ex, #ex, __FILE__, __LINE__)
	+#define MPASS2(ex, what) MPASS4(ex, what, __FILE__, __LINE__)
	+#define MPASS3(ex, file, line) MPASS4(ex, #ex, file, line)
	+#define MPASS4(ex, what, file, line) \
	+ KASSERT((ex), ("Assertion %s failed at %s:%d", what, file, line))
	+
	+/*
	* Assert that a pointer can be loaded from memory atomically.
	*
	* This assertion enforces stronger alignment than necessary. For example,