diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-08-17 00:13:53 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-08-17 00:13:53 -0400 |
| commit | 4eebf60b7452fbd551fd7dece855ba7825a49cbc (patch) | |
| tree | 490b4d194ba09c90e10201ab7fc084a0bda0ed27 /arch/s390/kernel/cache.c | |
| parent | 8f9cb50789e76f3e224e8861adf650e55c747af4 (diff) | |
| parent | 2c6625cd545bdd66acff14f3394865d43920a5c7 (diff) | |
Merge tag 'v4.2-rc7' into drm-next
Linux 4.2-rc7
Backmerge master for i915 fixes
Diffstat (limited to 'arch/s390/kernel/cache.c')
| -rw-r--r-- | arch/s390/kernel/cache.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/kernel/cache.c b/arch/s390/kernel/cache.c index bff5e3b6d822..8ba32436effe 100644 --- a/arch/s390/kernel/cache.c +++ b/arch/s390/kernel/cache.c | |||
| @@ -138,6 +138,8 @@ int init_cache_level(unsigned int cpu) | |||
| 138 | union cache_topology ct; | 138 | union cache_topology ct; |
| 139 | enum cache_type ctype; | 139 | enum cache_type ctype; |
| 140 | 140 | ||
| 141 | if (!test_facility(34)) | ||
| 142 | return -EOPNOTSUPP; | ||
| 141 | if (!this_cpu_ci) | 143 | if (!this_cpu_ci) |
| 142 | return -EINVAL; | 144 | return -EINVAL; |
| 143 | ct.raw = ecag(EXTRACT_TOPOLOGY, 0, 0); | 145 | ct.raw = ecag(EXTRACT_TOPOLOGY, 0, 0); |