svn commit: r279633 - stable/10/sys/sys

[Hans Petter Selasky]

Author: hselasky
Date: Thu Mar  5 09:23:43 2015
New Revision: 279633
URL: https://svnweb.freebsd.org/changeset/base/279633

Log:
  MFC r279241 and r279242:
  Fix debugging macros.

Modified:
  stable/10/sys/sys/queue.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/sys/queue.h
==============================================================================
--- stable/10/sys/sys/queue.h	Thu Mar  5 09:01:46 2015	(r279632)
+++ stable/10/sys/sys/queue.h	Thu Mar  5 09:23:43 2015	(r279633)
@@ -116,7 +116,7 @@ struct qm_trace {
 };
 
 #define	TRACEBUF	struct qm_trace trace;
-#define	TRACEBUF_INITIALIZER	{ __FILE__, __LINE__, NULL, 0 } ,
+#define	TRACEBUF_INITIALIZER	{ __LINE__, 0, __FILE__, NULL } ,
 #define	TRASHIT(x)	do {(x) = (void *)-1;} while (0)
 #define	QMD_SAVELINK(name, link)	void **name = (void *)&(link)
 
@@ -612,7 +612,7 @@ struct {								\
 	TAILQ_NEXT((listelm), field) = (elm);				\
 	(elm)->field.tqe_prev = &TAILQ_NEXT((listelm), field);		\
 	QMD_TRACE_ELEM(&(elm)->field);					\
-	QMD_TRACE_ELEM(&listelm->field);				\
+	QMD_TRACE_ELEM(&(listelm)->field);				\
 } while (0)
 
 #define	TAILQ_INSERT_BEFORE(listelm, elm, field) do {			\
@@ -622,7 +622,7 @@ struct {								\
 	*(listelm)->field.tqe_prev = (elm);				\
 	(listelm)->field.tqe_prev = &TAILQ_NEXT((elm), field);		\
 	QMD_TRACE_ELEM(&(elm)->field);					\
-	QMD_TRACE_ELEM(&listelm->field);				\
+	QMD_TRACE_ELEM(&(listelm)->field);				\
 } while (0)
 
 #define	TAILQ_INSERT_HEAD(head, elm, field) do {			\