diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index 5a8bf6c244211085473408e103be71072c1134c5..acdb384cd0fefa46e3f1cc60073aee15d2ccbc5f 100644
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -15,11 +15,7 @@
 #define BIOS_FILENAME "mipsel_bios.bin"
 #endif
 
-#ifdef TARGET_MIPS64
-#define PHYS_TO_VIRT(x) ((x) | ~0x7fffffffULL)
-#else
-#define PHYS_TO_VIRT(x) ((x) | ~0x7fffffffU)
-#endif
+#define PHYS_TO_VIRT(x) ((x) | ~(target_ulong)0x7fffffff)
 
 #define VIRT_TO_PHYS_ADDEND (-((int64_t)(int32_t)0x80000000))
 
@@ -152,7 +148,6 @@ void mips_r4k_init (int ram_size, int vga_ram_size, const char *boot_device,
     CPUState *env;
     RTCState *rtc_state;
     int i;
-    mips_def_t *def;
     qemu_irq *i8259;
 
     /* init CPUs */