mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
synced 2026-04-18 03:23:53 -04:00
Merge tag 'mm-nonmm-stable-2026-02-18-19-56' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Pull more non-MM updates from Andrew Morton: - "two fixes in kho_populate()" fixes a couple of not-major issues in the kexec handover code (Ran Xiaokai) - misc singletons * tag 'mm-nonmm-stable-2026-02-18-19-56' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm: lib/group_cpus: handle const qualifier from clusters allocation type kho: remove unnecessary WARN_ON(err) in kho_populate() kho: fix missing early_memunmap() call in kho_populate() scripts/gdb: implement x86_page_ops in mm.py objpool: fix the overestimation of object pooling metadata size selftests/memfd: use IPC semaphore instead of SIGSTOP/SIGCONT delayacct: fix build regression on accounting tool
This commit is contained in:
@@ -320,7 +320,7 @@ static int alloc_cluster_groups(unsigned int ncpus,
|
||||
goto no_cluster;
|
||||
|
||||
/* Allocate memory based on cluster number. */
|
||||
clusters = kcalloc(ncluster, sizeof(struct cpumask *), GFP_KERNEL);
|
||||
clusters = kcalloc(ncluster, sizeof(*clusters), GFP_KERNEL);
|
||||
if (!clusters)
|
||||
goto no_cluster;
|
||||
cluster_groups = kcalloc(ncluster, sizeof(struct node_groups), GFP_KERNEL);
|
||||
|
||||
@@ -142,7 +142,7 @@ int objpool_init(struct objpool_head *pool, int nr_objs, int object_size,
|
||||
pool->gfp = gfp & ~__GFP_ZERO;
|
||||
pool->context = context;
|
||||
pool->release = release;
|
||||
slot_size = nr_cpu_ids * sizeof(struct objpool_slot);
|
||||
slot_size = nr_cpu_ids * sizeof(struct objpool_slot *);
|
||||
pool->cpu_slots = kzalloc(slot_size, pool->gfp);
|
||||
if (!pool->cpu_slots)
|
||||
return -ENOMEM;
|
||||
|
||||
Reference in New Issue
Block a user