We talked about changing this, but missed when applying to target-arm.next.
---
target/arm/helper.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/target/arm/helper.c b/target/arm/helper.c
index 2edf84b898..be0ec7de2a 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -10757,7 +10757,7 @@ static bool get_phys_addr_lpae(CPUARMState *env,
target_ulong address,
}
/* Merge in attributes from table descriptors */
attrs |= nstable << 3; /* NS */
- guarded |= extract64(descriptor, 50, 1); /* GP */
+ guarded = extract64(descriptor, 50, 1); /* GP */
if (param.hpd) {
/* HPD disables all the table attributes except NSTable. */
break;
--
2.17.2
