diff options
| author | Tony Lindgren <[email protected]> | 2017-11-28 08:12:32 -0800 |
|---|---|---|
| committer | Tony Lindgren <[email protected]> | 2017-11-28 08:12:32 -0800 |
| commit | bc686442f8a601bccac1f22506ecdb4b0d62cadd (patch) | |
| tree | b224ab4aa2350b233da640f5850f48bc6bfeb2d0 /arch/powerpc/lib/code-patching.c | |
| parent | 60636a5d0fa2f8bc6d0c23c4027100ba20866f9b (diff) | |
| parent | ca41e244517d6d3f1600c229ff7ca615049c1e9c (diff) | |
Merge branch 'dts-fixes' into omap-for-v4.15/fixes-dt
Diffstat (limited to 'arch/powerpc/lib/code-patching.c')
| -rw-r--r-- | arch/powerpc/lib/code-patching.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/powerpc/lib/code-patching.c b/arch/powerpc/lib/code-patching.c index c9de03e0c1f1..d469224c4ada 100644 --- a/arch/powerpc/lib/code-patching.c +++ b/arch/powerpc/lib/code-patching.c @@ -21,6 +21,7 @@ #include <asm/tlbflush.h> #include <asm/page.h> #include <asm/code-patching.h> +#include <asm/setup.h> static int __patch_instruction(unsigned int *addr, unsigned int instr) { @@ -146,11 +147,8 @@ int patch_instruction(unsigned int *addr, unsigned int instr) * During early early boot patch_instruction is called * when text_poke_area is not ready, but we still need * to allow patching. We just do the plain old patching - * We use slab_is_available and per cpu read * via this_cpu_read - * of text_poke_area. Per-CPU areas might not be up early - * this can create problems with just using this_cpu_read() */ - if (!slab_is_available() || !this_cpu_read(text_poke_area)) + if (!this_cpu_read(*PTRRELOC(&text_poke_area))) return __patch_instruction(addr, instr); local_irq_save(flags); |