X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Flinux%2Fhardirq.h;h=2961ec788046627c823feb291d7d522f15982fbf;hb=0ba6c33bcddc64a54b5f1c25a696c4767dc76292;hp=8d302298a161941ce40c6ed47411627d5f0229f8;hpb=bc06cffdec85d487c77109dffcd2f285bdc502d3;p=linux-2.6

diff --git a/include/linux/hardirq.h b/include/linux/hardirq.h
index 8d302298a1..2961ec7880 100644
--- a/include/linux/hardirq.h
+++ b/include/linux/hardirq.h
@@ -72,11 +72,7 @@
 #define in_softirq()		(softirq_count())
 #define in_interrupt()		(irq_count())
 
-#if defined(CONFIG_PREEMPT) && !defined(CONFIG_PREEMPT_BKL)
-# define in_atomic()	((preempt_count() & ~PREEMPT_ACTIVE) != kernel_locked())
-#else
-# define in_atomic()	((preempt_count() & ~PREEMPT_ACTIVE) != 0)
-#endif
+#define in_atomic()		((preempt_count() & ~PREEMPT_ACTIVE) != 0)
 
 #ifdef CONFIG_PREEMPT
 # define PREEMPT_CHECK_OFFSET 1