diff options
| author | Ingo Molnar <mingo@kernel.org> | 2024-09-05 11:17:43 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-09-05 11:17:43 +0200 |
| commit | 95c13662b65c562d4902ad9f810378261347a749 (patch) | |
| tree | 036091f8615fdf2d00021709993b00790a630250 /kernel/events/uprobes.c | |
| parent | fe826cc2654e8561b64246325e6a51b62bf2488c (diff) | |
| parent | 2ab9d830262c132ab5db2f571003d80850d56b2a (diff) | |
| download | linux-95c13662b65c562d4902ad9f810378261347a749.tar.gz linux-95c13662b65c562d4902ad9f810378261347a749.tar.bz2 linux-95c13662b65c562d4902ad9f810378261347a749.zip | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
This also refreshes the -rc1 based branch to -rc5.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/events/uprobes.c')
| -rw-r--r-- | kernel/events/uprobes.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index 30348f13d4a7..cac45ea4c284 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -1470,7 +1470,7 @@ static struct xol_area *__create_xol_area(unsigned long vaddr) struct xol_area *area; void *insns; - area = kmalloc(sizeof(*area), GFP_KERNEL); + area = kzalloc(sizeof(*area), GFP_KERNEL); if (unlikely(!area)) goto out; @@ -1480,7 +1480,6 @@ static struct xol_area *__create_xol_area(unsigned long vaddr) goto free_area; area->xol_mapping.name = "[uprobes]"; - area->xol_mapping.fault = NULL; area->xol_mapping.pages = area->pages; area->pages[0] = alloc_page(GFP_HIGHUSER); if (!area->pages[0]) |