Fixup unit tests for cpu_queue_job() in mem_region.c

Fixes: 06808a037d44231ba36e814ff1dbf66bc8b707da
Signed-off-by: Stewart Smith <stewart@linux.ibm.com>

5 files changed, 21 insertions, 5 deletions

diff --git a/core/test/Makefile.check b/core/test/Makefile.check
index 11857ca6..a5226a89 100644
--- a/core/test/Makefile.check
+++ b/core/test/Makefile.check
@@ -22,7 +22,7 @@ CORE_TEST := \
 	core/test/run-buddy \
 	core/test/run-pci-quirk
 
-HOSTCFLAGS+=-I . -I include
+HOSTCFLAGS+=-I . -I include -Wno-error=attributes
 
 CORE_TEST_NOSTUB := core/test/run-console-log
 CORE_TEST_NOSTUB += core/test/run-console-log-buf-overrun
diff --git a/core/test/dummy-cpu.h b/core/test/dummy-cpu.h
index 46f180cd..88b54cef 100644
--- a/core/test/dummy-cpu.h
+++ b/core/test/dummy-cpu.h
@@ -32,6 +32,13 @@ struct cpu_job *__cpu_queue_job(struct cpu_thread *cpu,
 				const char *name,
 				void (*func)(void *data), void *data,
 				bool no_return);
+static inline struct cpu_job *cpu_queue_job(struct cpu_thread *cpu,
+					    const char *name,
+					    void (*func)(void *data),
+					    void *data)
+{
+	return __cpu_queue_job(cpu, name, func, data, false);
+}
 void cpu_wait_job(struct cpu_job *job, bool free_it);
 void cpu_process_local_jobs(void);
 struct cpu_job *cpu_queue_job_on_node(uint32_t chip_id,
diff --git a/core/test/stubs.c b/core/test/stubs.c
index 939e3dc7..66252f8a 100644
--- a/core/test/stubs.c
+++ b/core/test/stubs.c
@@ -18,6 +18,7 @@
 #include <stdarg.h>
 #include <stdint.h>
 
+#include <compiler.h>
 #include "../../ccan/list/list.c"
 
 void _prlog(int log_level __attribute__((unused)), const char* fmt, ...) __attribute__((format (printf, 2, 3)));
@@ -48,6 +49,7 @@ struct cpu_job *__cpu_queue_job(struct cpu_thread *cpu,
 				const char *name,
 				void (*func)(void *data), void *data,
 				bool no_return);
+
 void cpu_wait_job(struct cpu_job *job, bool free_it);
 void cpu_process_local_jobs(void);
 struct cpu_job *cpu_queue_job_on_node(uint32_t chip_id,
@@ -74,14 +76,14 @@ struct cpu_job *__cpu_queue_job(struct cpu_thread *cpu,
 	return NULL;
 }
 
-void cpu_wait_job(struct cpu_job *job, bool free_it)
+void __attrconst cpu_wait_job(struct cpu_job *job, bool free_it)
 {
 	(void)job;
 	(void)free_it;
 	return;
 }
 
-void cpu_process_local_jobs(void)
+void __attrconst cpu_process_local_jobs(void)
 {
 }
 
diff --git a/hdata/test/hdata_to_dt.c b/hdata/test/hdata_to_dt.c
index bd11fb0b..c75a4adc 100644
--- a/hdata/test/hdata_to_dt.c
+++ b/hdata/test/hdata_to_dt.c
@@ -92,6 +92,13 @@ void cpu_process_local_jobs(void);
 struct cpu_job *cpu_queue_job_on_node(uint32_t chip_id,
 				       const char *name,
 				       void (*func)(void *data), void *data);
+static inline struct cpu_job *cpu_queue_job(struct cpu_thread *cpu,
+					    const char *name,
+					    void (*func)(void *data),
+					    void *data)
+{
+	return __cpu_queue_job(cpu, name, func, data, false);
+}
 
 struct cpu_thread __boot_cpu, *boot_cpu = &__boot_cpu;
 static unsigned long fake_pvr = PVR_P7;
diff --git a/hdata/test/stubs.c b/hdata/test/stubs.c
index f7b1da10..ab6e2cec 100644
--- a/hdata/test/stubs.c
+++ b/hdata/test/stubs.c
@@ -118,7 +118,7 @@ struct cpu_job *__cpu_queue_job(struct cpu_thread *cpu,
 
 void cpu_wait_job(struct cpu_job *job, bool free_it);
 
-void cpu_wait_job(struct cpu_job *job, bool free_it)
+void __attrconst cpu_wait_job(struct cpu_job *job, bool free_it)
 {
 	(void)job;
 	(void)free_it;
@@ -127,7 +127,7 @@ void cpu_wait_job(struct cpu_job *job, bool free_it)
 
 void cpu_process_local_jobs(void);
 
-void cpu_process_local_jobs(void)
+void __attrconst cpu_process_local_jobs(void)
 {
 }