diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-03-23 14:51:10 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-03-23 14:51:10 +0000 |
| commit | 21c84c91f726054672e187112b698aa3d5e181f4 (patch) | |
| tree | a252273daf3050f2694bdbecfc54a40c311b7aed | |
| parent | b79fbb2d70524548abfb8482bd1e5713b5f7dcdc (diff) | |
| parent | a352aa62a75fcb1db35a0c71a10af3b2c1f8b89f (diff) | |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20170323' into staging
Fix linux-user vs. cpu models.
# gpg: Signature made Thu 23 Mar 2017 09:56:13 GMT
# gpg: using RSA key 0xDECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg: aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0 18CE DECF 6B93 C6F0 2FAF
* remotes/cohuck/tags/s390x-20170323:
target/s390x: Fix broken user mode
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | target/s390x/cpu_models.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c index 4ea3a2de80..1434d15315 100644 --- a/target/s390x/cpu_models.c +++ b/target/s390x/cpu_models.c @@ -660,7 +660,6 @@ static void check_compatibility(const S390CPUModel *max_model, static S390CPUModel *get_max_cpu_model(Error **errp) { -#ifndef CONFIG_USER_ONLY static S390CPUModel max_model; static bool cached; @@ -680,7 +679,6 @@ static S390CPUModel *get_max_cpu_model(Error **errp) cached = true; return &max_model; } -#endif return NULL; } |