svn commit: r362108 - head/sys/compat/linuxkpi/common/include/linux

[Doug Moore]

Author: dougm
Date: Fri Jun 12 16:51:55 2020
New Revision: 362108
URL: https://svnweb.freebsd.org/changeset/base/362108

Log:
  The linuxkpi code accesses left/right rb tree pointers without using
  RB_LEFT or RB_RIGHT, so they aren't stripping off the color bit
  encoded there. Strip off that bit for linuxkpi.
  
  Reported by:	dch
  Reviewed by:	markj
  Differential Revision:	https://reviews.freebsd.org/D25245

Modified:
  head/sys/compat/linuxkpi/common/include/linux/rbtree.h

Modified: head/sys/compat/linuxkpi/common/include/linux/rbtree.h
==============================================================================
--- head/sys/compat/linuxkpi/common/include/linux/rbtree.h	Fri Jun 12 16:40:10 2020	(r362107)
+++ head/sys/compat/linuxkpi/common/include/linux/rbtree.h	Fri Jun 12 16:51:55 2020	(r362108)
@@ -37,8 +37,8 @@
 struct rb_node {
 	RB_ENTRY(rb_node)	__entry;
 };
-#define	rb_left		__entry.rbe_left
-#define	rb_right	__entry.rbe_right
+#define	rb_left		RB_PTR(__entry.rbe_left)
+#define	rb_right	RB_PTR(__entry.rbe_right)
 
 /*
  * We provide a false structure that has the same bit pattern as tree.h