Message ID | 20220227182125.21809-4-richard.henderson@linaro.org |
---|---|
State | Superseded |
Headers | show |
Series | target/nios2: Rewrite interrupt handling | expand |
On 27/2/22 19:21, Richard Henderson wrote: > We can thus remove an ifdef covering the entire file. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > target/nios2/mmu.c | 3 --- > target/nios2/meson.build | 3 +-- > 2 files changed, 1 insertion(+), 5 deletions(-) \o/ Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
On Sun, 27 Feb 2022 at 18:23, Richard Henderson <richard.henderson@linaro.org> wrote: > > We can thus remove an ifdef covering the entire file. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > target/nios2/mmu.c | 3 --- > target/nios2/meson.build | 3 +-- Reviewed-by: Peter Maydell <peter.maydell@linaro.org> thanks -- PMM
diff --git a/target/nios2/mmu.c b/target/nios2/mmu.c index 306370f675..437fad09b7 100644 --- a/target/nios2/mmu.c +++ b/target/nios2/mmu.c @@ -25,7 +25,6 @@ #include "mmu.h" #include "trace/trace-target_nios2.h" -#if !defined(CONFIG_USER_ONLY) /* rw - 0 = read, 1 = write, 2 = fetch. */ unsigned int mmu_translate(CPUNios2State *env, @@ -217,5 +216,3 @@ void dump_mmu(CPUNios2State *env) (entry->data & CR_TLBACC_X) ? 'X' : '-'); } } - -#endif /* !CONFIG_USER_ONLY */ diff --git a/target/nios2/meson.build b/target/nios2/meson.build index e643917db1..62b384702d 100644 --- a/target/nios2/meson.build +++ b/target/nios2/meson.build @@ -2,14 +2,13 @@ nios2_ss = ss.source_set() nios2_ss.add(files( 'cpu.c', 'helper.c', - 'mmu.c', 'nios2-semi.c', 'op_helper.c', 'translate.c', )) nios2_softmmu_ss = ss.source_set() -nios2_softmmu_ss.add(files('monitor.c')) +nios2_softmmu_ss.add(files('monitor.c', 'mmu.c')) target_arch += {'nios2': nios2_ss} target_softmmu_arch += {'nios2': nios2_softmmu_ss}
We can thus remove an ifdef covering the entire file. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- target/nios2/mmu.c | 3 --- target/nios2/meson.build | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-)