D33887.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D33887.diff
View Options

	diff --git a/sys/compat/linuxkpi/common/include/linux/spinlock.h b/sys/compat/linuxkpi/common/include/linux/spinlock.h
	--- a/sys/compat/linuxkpi/common/include/linux/spinlock.h
	+++ b/sys/compat/linuxkpi/common/include/linux/spinlock.h
	@@ -37,6 +37,7 @@
	#include <sys/lock.h>
	#include <sys/mutex.h>
	#include <sys/kdb.h>
	+#include <sys/proc.h>

	#include <linux/compiler.h>
	#include <linux/rwlock.h>
	@@ -117,14 +118,32 @@
	local_bh_disable(); \
	} while (0)

	-#define spin_lock_irqsave(_l, flags) do { \
	- (flags) = 0; \
	- spin_lock(_l); \
	+#define __spin_trylock_nested(_l, _n) ({ \
	+ int __ret; \
	+ if (SPIN_SKIP()) { \
	+ __ret = 1; \
	+ } else { \
	+ __ret = mtx_trylock_flags(&(_l)->m, MTX_DUPOK); \
	+ if (likely(__ret != 0)) \
	+ local_bh_disable(); \
	+ } \
	+ __ret; \
	+})
	+
	+#define spin_lock_irqsave(_l, flags) do { \
	+ (flags) = 0; \
	+ if (unlikely(curthread->td_critnest != 0)) \
	+ while (!spin_trylock(_l)) {} \
	+ else \
	+ spin_lock(_l); \
	} while (0)

	#define spin_lock_irqsave_nested(_l, flags, _n) do { \
	(flags) = 0; \
	- spin_lock_nested(_l, _n); \
	+ if (unlikely(curthread->td_critnest != 0)) \
	+ while (!__spin_trylock_nested(_l, _n)) {} \
	+ else \
	+ spin_lock_nested(_l, _n); \
	} while (0)

	#define spin_unlock_irqrestore(_l, flags) do { \