Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa6f2cc7 authored by Jason Baron's avatar Jason Baron Committed by Steven Rostedt
Browse files

jump label: Make text_poke_early() globally visible 



Make text_poke_early available outside of alternative.c. The jump label
patchset wants to make use of it in order to set up the optimal no-op
sequences at run-time.

Signed-off-by: default avatarJason Baron <jbaron@redhat.com>
LKML-Reference: <04cfddf2ba77bcabfc3e524f1849d871d6a1cf9d.1284733808.git.jbaron@redhat.com>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent f49aa448

arch/x86/include/asm/alternative.h

+2 −0
Original line number Diff line number Diff line
@@ -160,6 +160,8 @@ static inline void apply_paravirt(struct paravirt_patch_site *start, 
#define __parainstructions_end	NULL

#endif



extern void *text_poke_early(void *addr, const void *opcode, size_t len);



/*

 * Clear and restore the kernel write-protection flag on the local CPU.

 * Allows the kernel to edit read-only pages.

arch/x86/kernel/alternative.c

+2 −2
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ static void __init_or_module add_nops(void *insns, unsigned int len) 


extern struct alt_instr __alt_instructions[], __alt_instructions_end[];

extern s32 __smp_locks[], __smp_locks_end[];

static void *text_poke_early(void *addr, const void *opcode, size_t len);

void *text_poke_early(void *addr, const void *opcode, size_t len);



/* Replace instructions with better alternatives for this CPU type.

   This runs before SMP is initialized to avoid SMP problems with
@@ -522,7 +522,7 @@ void __init alternative_instructions(void) 
 * instructions. And on the local CPU you need to be protected again NMI or MCE

 * handlers seeing an inconsistent instruction while you patch.

 */

static void *__init_or_module text_poke_early(void *addr, const void *opcode,

void *__init_or_module text_poke_early(void *addr, const void *opcode,

					      size_t len)

{

	unsigned long flags;