diff options
| author | Wolfram Sang <wsa@the-dreams.de> | 2018-10-05 14:19:02 +0200 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2018-10-05 14:19:02 +0200 |
| commit | 05552832204e37e038d550e1354300eb11a9e5ec (patch) | |
| tree | 69f7ef1f98e2382b35d7e6098705c00fcfa3d3c3 /arch/powerpc/lib/code-patching.c | |
| parent | 49d54abee9d1507e117a4218dc5baa3ebc5b93f1 (diff) | |
| parent | 9a9e295e7c5c0409c020088b0ae017e6c2b7df6e (diff) | |
Merge tag 'at24-4.20-updates-for-wolfram' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into i2c/for-4.20
AT24 updates for 4.20
Single patch from Wang Xin improving the read/write loop in at24
under high load.
Diffstat (limited to 'arch/powerpc/lib/code-patching.c')
| -rw-r--r-- | arch/powerpc/lib/code-patching.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/powerpc/lib/code-patching.c b/arch/powerpc/lib/code-patching.c index 850f3b8f4da5..6ae2777c220d 100644 --- a/arch/powerpc/lib/code-patching.c +++ b/arch/powerpc/lib/code-patching.c @@ -28,6 +28,12 @@ static int __patch_instruction(unsigned int *exec_addr, unsigned int instr, { int err; + /* Make sure we aren't patching a freed init section */ + if (init_mem_is_free && init_section_contains(exec_addr, 4)) { + pr_debug("Skipping init section patching addr: 0x%px\n", exec_addr); + return 0; + } + __put_user_size(instr, patch_addr, 4, err); if (err) return err; |