Revert "zephyr: fix build after a recent trace filter PR"

marc-hb · lgirdwood · commit ecd2d464f926 · 2021-12-25T20:54:50.000Z
This reverts commit b31d19b. Part of the fix for thesofproject#5032 Signed-off-by: Marc Herbert <marc.herbert@intel.com>
diff --git a/src/trace/trace.c b/src/trace/trace.c
@@ -342,7 +342,7 @@ struct sof_ipc_trace_filter_elem *trace_filter_fill(struct sof_ipc_trace_filter_
 static int trace_filter_update_global(int32_t log_level, uint32_t uuid_id)
 {
 	int cnt = 0;
-#if !defined(__ZEPHYR__) && !defined(CONFIG_LIBRARY)
+#if !defined(CONFIG_LIBRARY)
 	extern void *_trace_ctx_start;
 	extern void *_trace_ctx_end;
 	struct tr_ctx *ptr = (struct tr_ctx *)&_trace_ctx_start;

Original file line number	Diff line number	Diff line change
`@@ -342,7 +342,7 @@ struct sof_ipc_trace_filter_elem *trace_filter_fill(struct sof_ipc_trace_filter_`
`342`	`342`	`static int trace_filter_update_global(int32_t log_level, uint32_t uuid_id)`
`343`	`343`	`{`
`344`	`344`	`int cnt = 0;`
`345`		`-#if !defined(__ZEPHYR__) && !defined(CONFIG_LIBRARY)`
	`345`	`+#if !defined(CONFIG_LIBRARY)`
`346`	`346`	`extern void *_trace_ctx_start;`
`347`	`347`	`extern void *_trace_ctx_end;`
`348`	`348`	`struct tr_ctx ptr = (struct tr_ctx )&_trace_ctx_start;`