Merge remote-tracking branch 'remotes/ehabkost/tags/x86-next-pull-request' into staging
Fix for -rc2
* Fix build failure on mips host
# gpg: Signature made Mon 23 Jul 2018 20:44:47 BST
# gpg: using RSA key
2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6
* remotes/ehabkost/tags/x86-next-pull-request:
i386: Rename enum CacheType members
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>