diff options
| author | Mark Brown <broonie@kernel.org> | 2025-03-05 19:10:50 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2025-03-05 19:10:50 +0000 |
| commit | c6141ba0110f98266106699aca071fed025c3d64 (patch) | |
| tree | 5b2c335cbed607d85e2fa51c54e29a2e4b0eb24d /arch/powerpc/lib/code-patching.c | |
| parent | a1462fb8b5dd1018e3477a6861822d75c6a59449 (diff) | |
| parent | 927e6bec5cf3624665b0a2e9f64a1d32f3d22cdd (diff) | |
| download | lwn-c6141ba0110f98266106699aca071fed025c3d64.tar.gz lwn-c6141ba0110f98266106699aca071fed025c3d64.zip | |
ASoC: Merge up fixes
Merge branch 'for-6.14' of
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into
asoc-6.15 to avoid a bunch of add/add conflicts.
Diffstat (limited to 'arch/powerpc/lib/code-patching.c')
| -rw-r--r-- | arch/powerpc/lib/code-patching.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/lib/code-patching.c b/arch/powerpc/lib/code-patching.c index af97fbb3c257..f84e0337cc02 100644 --- a/arch/powerpc/lib/code-patching.c +++ b/arch/powerpc/lib/code-patching.c @@ -108,7 +108,7 @@ static int text_area_cpu_up(unsigned int cpu) unsigned long addr; int err; - area = get_vm_area(PAGE_SIZE, VM_ALLOC); + area = get_vm_area(PAGE_SIZE, 0); if (!area) { WARN_ONCE(1, "Failed to create text area for cpu %d\n", cpu); @@ -493,7 +493,9 @@ static int __do_patch_instructions_mm(u32 *addr, u32 *code, size_t len, bool rep orig_mm = start_using_temp_mm(patching_mm); + kasan_disable_current(); err = __patch_instructions(patch_addr, code, len, repeat_instr); + kasan_enable_current(); /* context synchronisation performed by __patch_instructions */ stop_using_temp_mm(patching_mm, orig_mm); |