svn commit: r249080 - stable/9/sys/dev/drm2

[Konstantin Belousov]

Author: kib
Date: Thu Apr  4 05:36:11 2013
New Revision: 249080
URL: http://svnweb.freebsd.org/changeset/base/249080

Log:
  MFC r247832:
  Import the likely() compat macro.
  
  MFC r247838:
  Correct the r247832.

Modified:
  stable/9/sys/dev/drm2/drmP.h
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/drm2/drmP.h
==============================================================================
--- stable/9/sys/dev/drm2/drmP.h	Thu Apr  4 05:29:37 2013	(r249079)
+++ stable/9/sys/dev/drm2/drmP.h	Thu Apr  4 05:36:11 2013	(r249080)
@@ -228,6 +228,7 @@ typedef void			irqreturn_t;
 #define IRQ_NONE		/* nothing */
 
 #define unlikely(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) );})