diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-01-25 10:42:51 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-01-25 10:42:52 +0000 |
| commit | 6ee06cc3dc7e8eb238e2f60cfd04f094d5c6b948 (patch) | |
| tree | 18098d760b4dc45db33e2bc29a191df5b68faea2 /hw/mips/cputimer.c | |
| parent | 047e363b05679724d6b784c6ec6310697fe48ba0 (diff) | |
| parent | c684822ad29968af09735148f03a511bc514589d (diff) | |
Merge remote-tracking branch 'remotes/lalrae/tags/mips-20160125' into staging
MIPS patches 2016-01-25
Changes:
* fixes and includes clean-up
# gpg: Signature made Mon 25 Jan 2016 09:29:51 GMT using RSA key ID 0B29DA6B
# gpg: Good signature from "Leon Alrae <leon.alrae@imgtec.com>"
* remotes/lalrae/tags/mips-20160125:
mips: Clean up includes
target-mips: Fix ALIGN instruction when bp=0
target-mips: silence NaNs for cvt.s.d and cvt.d.s
target-mips/cpu.h: Fix spell error
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/mips/cputimer.c')
| -rw-r--r-- | hw/mips/cputimer.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/mips/cputimer.c b/hw/mips/cputimer.c index f046588ada..efb227d06e 100644 --- a/hw/mips/cputimer.c +++ b/hw/mips/cputimer.c @@ -20,6 +20,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "hw/hw.h" #include "hw/mips/cpudevs.h" #include "qemu/timer.h" |