[sheepdog] [PATCH stable-0.7 1/2] trace: use correct constant for ifdefs

Hitoshi Mitake mitake.hitoshi at lab.ntt.co.jp
Mon Jan 27 07:22:14 CET 2014


From: Hitoshi Mitake <mitake.hitoshi at gmail.com>

Signed-off-by: Hitoshi Mitake <mitake.hitoshi at lab.ntt.co.jp>
Signed-off-by: Liu Yuan <namei.unix at gmail.com>
---
 include/work.h |    4 ++--
 lib/work.c     |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/work.h b/include/work.h
index 713576f..bc1c64c 100644
--- a/include/work.h
+++ b/include/work.h
@@ -64,9 +64,9 @@ struct work_queue *create_ordered_work_queue(const char *name);
 void queue_work(struct work_queue *q, struct work *work);
 bool work_queue_empty(struct work_queue *q);
 
-#ifdef ENABLE_TRACE
+#ifdef HAVE_TRACE
 void suspend_worker_threads(void);
 void resume_worker_threads(void);
-#endif	/* BUILD_TRACE */
+#endif	/* HAVE_TRACE */
 
 #endif
diff --git a/lib/work.c b/lib/work.c
index d75b905..55f3399 100644
--- a/lib/work.c
+++ b/lib/work.c
@@ -73,7 +73,7 @@ static size_t (*wq_get_nr_nodes)(void);
 
 static void *worker_routine(void *arg);
 
-#ifdef ENABLE_TRACE
+#ifdef HAVE_TRACE
 
 #define TID_MAX_DEFAULT 0x8000 /* default maximum tid for most systems */
 
@@ -186,7 +186,7 @@ static inline int wq_trace_init(void) { return 0; }
 static inline void trace_set_tid_map(int tid) {}
 static inline void trace_clear_tid_map(int tid) {}
 
-#endif	/* ENABLE_TRACE */
+#endif	/* HAVE_TRACE */
 
 static uint64_t get_msec_time(void)
 {
-- 
1.7.10.4




More information about the sheepdog mailing list