diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2021-06-25 18:24:24 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-06-25 18:24:24 +0300 |
| commit | b8917b4ae44d1b945f6fba3d8ee6777edb44633b (patch) | |
| tree | 0e3b6b1113b40d444f078b3bedcd98b93ac78f4a /drivers/char/hpet.c | |
| parent | 79b1e56509beb8d53b2b92f27555cd2175c67b8a (diff) | |
| parent | 188982cda00ebfe28b50c2905d9bbaa2e9a001b9 (diff) | |
| download | linux-b8917b4ae44d1b945f6fba3d8ee6777edb44633b.tar.xz | |
Merge tag 'kvmarm-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/arm64 updates for v5.14.
- Add MTE support in guests, complete with tag save/restore interface
- Reduce the impact of CMOs by moving them in the page-table code
- Allow device block mappings at stage-2
- Reduce the footprint of the vmemmap in protected mode
- Support the vGIC on dumb systems such as the Apple M1
- Add selftest infrastructure to support multiple configuration
and apply that to PMU/non-PMU setups
- Add selftests for the debug architecture
- The usual crop of PMU fixes
Diffstat (limited to 'drivers/char/hpet.c')
| -rw-r--r-- | drivers/char/hpet.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c index ed3b7dab678d..8b55085650ad 100644 --- a/drivers/char/hpet.c +++ b/drivers/char/hpet.c @@ -984,6 +984,8 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data) hdp->hd_phys_address = fixmem32->address; hdp->hd_address = ioremap(fixmem32->address, HPET_RANGE_SIZE); + if (!hdp->hd_address) + return AE_ERROR; if (hpet_is_known(hdp)) { iounmap(hdp->hd_address); |