From: Philippe Mathieu-Daudé <f4bug@amsat.org>
Date: Sun, 13 Dec 2020 16:36:01 +0000 (+0100)
Subject: target/mips: Remove consecutive CONFIG_USER_ONLY ifdefs
X-Git-Tag: v6.0.0-rc0~147^2~47
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2be565f9c2f8c2a1eb40efb86175e9f0c76761a4;p=users%2Fdwmw2%2Fqemu.git

target/mips: Remove consecutive CONFIG_USER_ONLY ifdefs

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20201214183739.500368-5-f4bug@amsat.org>
---

diff --git a/target/mips/helper.c b/target/mips/helper.c
index 92bd3fb855..cfb6d82fd3 100644
--- a/target/mips/helper.c
+++ b/target/mips/helper.c
@@ -552,9 +552,7 @@ hwaddr mips_cpu_get_phys_page_debug(CPUState *cs, vaddr addr)
     }
     return phys_addr;
 }
-#endif /* !CONFIG_USER_ONLY */
 
-#if !defined(CONFIG_USER_ONLY)
 #if !defined(TARGET_MIPS64)
 
 /*