diff options
Diffstat (limited to 'linux-user')
-rw-r--r-- | linux-user/arm/target_proc.h | 2 | ||||
-rw-r--r-- | linux-user/strace.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/linux-user/arm/target_proc.h b/linux-user/arm/target_proc.h index a4cd694..a28d723 100644 --- a/linux-user/arm/target_proc.h +++ b/linux-user/arm/target_proc.h @@ -6,6 +6,8 @@ #ifndef ARM_TARGET_PROC_H #define ARM_TARGET_PROC_H +#include "target/arm/cpu-features.h" /* for MIDR_EL1 field definitions */ + static int open_cpuinfo(CPUArchState *cpu_env, int fd) { ARMCPU *cpu = env_archcpu(cpu_env); diff --git a/linux-user/strace.c b/linux-user/strace.c index 1233ebc..758c5d3 100644 --- a/linux-user/strace.c +++ b/linux-user/strace.c @@ -54,7 +54,7 @@ struct flags { }; /* No 'struct flags' element should have a zero mask. */ -#define FLAG_BASIC(V, M, N) { V, M | QEMU_BUILD_BUG_ON_ZERO(!(M)), N } +#define FLAG_BASIC(V, M, N) { V, M | QEMU_BUILD_BUG_ON_ZERO((M) == 0), N } /* common flags for all architectures */ #define FLAG_GENERIC_MASK(V, M) FLAG_BASIC(V, M, #V) |