svn commit: r247838 - head/sys/dev/drm2

[Konstantin Belousov]

Author: kib
Date: Tue Mar  5 11:02:38 2013
New Revision: 247838
URL: http://svnweb.freebsd.org/changeset/base/247838

Log:
  Correct the r247832.
  
  Noted by:	marius, rdivacky
  MFC after:	1 month

Modified:
  head/sys/dev/drm2/drmP.h

Modified: head/sys/dev/drm2/drmP.h
==============================================================================
--- head/sys/dev/drm2/drmP.h	Tue Mar  5 11:02:05 2013	(r247837)
+++ head/sys/dev/drm2/drmP.h	Tue Mar  5 11:02:38 2013	(r247838)
@@ -228,7 +228,7 @@ typedef void			irqreturn_t;
 #define IRQ_NONE		/* nothing */
 
 #define unlikely(x)            __builtin_expect(!!(x), 0)
-#define likely(x)              __builtin_expect((x), 0)
+#define likely(x)              __builtin_expect(!!(x), 1)
 #define container_of(ptr, type, member) ({			\
 	__typeof( ((type *)0)->member ) *__mptr = (ptr);	\
 	(type *)( (char *)__mptr - offsetof(type,member) );})