diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-07-09 18:29:00 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-07-09 18:29:00 +0100 |
| commit | 3379c6cce7814b3371b66efc13c1bef3088ea9cd (patch) | |
| tree | acb116bc1c981fc2d9e6ffb561d0e1d31c2d3ef4 /include/hw | |
| parent | ec7eb2ae77cc207064e17ace048f7ec0c4b85d6f (diff) | |
| parent | 97e50dd013fbf2643a3b3f693a72159de5d25b50 (diff) | |
Merge remote-tracking branch 'remotes/ehabkost/tags/x86-next-pull-request' into staging
x86 fix for -rc0
* Fix EPYC-IBPB compat code
# gpg: Signature made Mon 09 Jul 2018 18:21:27 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:
pc: Fix typo on PC_COMPAT_2_12
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw')
| -rw-r--r-- | include/hw/i386/pc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 4d99d69681..654003f44c 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -309,7 +309,7 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); .property = "xlevel",\ .value = stringify(0x8000000a),\ },{\ - .driver = "EPYC-IBPB" TYPE_X86_CPU,\ + .driver = "EPYC-IBPB-" TYPE_X86_CPU,\ .property = "xlevel",\ .value = stringify(0x8000000a),\ }, |