diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-12-15 12:48:24 -0500 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-12-15 12:48:24 -0500 |
| commit | 722e039d9a290a06e38199f6baffc04cfd98f2db (patch) | |
| tree | 2a4ac383efafe5a77c8c9dddb503d6978044ace1 /mm/slub.c | |
| parent | 8640ca588b032166d6be6b4d3632d565d6d88e89 (diff) | |
| parent | 3a514592b698588326924625b6948a10c35fadd5 (diff) | |
| download | linux-722e039d9a290a06e38199f6baffc04cfd98f2db.tar.gz linux-722e039d9a290a06e38199f6baffc04cfd98f2db.tar.bz2 linux-722e039d9a290a06e38199f6baffc04cfd98f2db.zip | |
Merge tag 'kvmarm-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/arm64 updates for Linux 5.11
- PSCI relay at EL2 when "protected KVM" is enabled
- New exception injection code
- Simplification of AArch32 system register handling
- Fix PMU accesses when no PMU is enabled
- Expose CSV3 on non-Meltdown hosts
- Cache hierarchy discovery fixes
- PV steal-time cleanups
- Allow function pointers at EL2
- Various host EL2 entry cleanups
- Simplification of the EL2 vector allocation
Diffstat (limited to 'mm/slub.c')
| -rw-r--r-- | mm/slub.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/slub.c b/mm/slub.c index b30be2385d1c..34dcc09e2ec9 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -2852,7 +2852,7 @@ redo: object = c->freelist; page = c->page; - if (unlikely(!object || !node_match(page, node))) { + if (unlikely(!object || !page || !node_match(page, node))) { object = __slab_alloc(s, gfpflags, node, addr, c); } else { void *next_object = get_freepointer_safe(s, object); |