[patch 01/12] x86: text_poke_early non static

Mathieu Desnoyers
2009-09-24T14:44:39Z

[-- Attachment #1: x86-text-poke-early-non-static.patch --]
[-- Type: text/plain, Size: 2151 bytes --]

Needed by immediate.c.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
CC: Ingo Molnar <mingo@redhat.com>
---
arch/x86/include/asm/alternative.h | 5 +++++
arch/x86/kernel/alternative.c | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)

Index: linux.trees.git/arch/x86/kernel/alternative.c
===================================================================
--- linux.trees.git.orig/arch/x86/kernel/alternative.c 2009-09-24 09:13:59.000000000 -0400
+++ linux.trees.git/arch/x86/kernel/alternative.c 2009-09-24 09:15:01.000000000 -0400
@@ -193,7 +193,7 @@ static void __init_or_module add_nops(vo

extern struct alt_instr __alt_instructions[], __alt_instructions_end[];
extern u8 *__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
@@ -492,7 +492,7 @@ void __init alternative_instructions(voi
* 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;
Index: linux.trees.git/arch/x86/include/asm/alternative.h
===================================================================
--- linux.trees.git.orig/arch/x86/include/asm/alternative.h 2009-09-24 09:15:22.000000000 -0400
+++ linux.trees.git/arch/x86/include/asm/alternative.h 2009-09-24 09:15:56.000000000 -0400
@@ -160,4 +160,9 @@ static inline void apply_paravirt(struct
*/
extern void *text_poke(void *addr, const void *opcode, size_t len);

+/*
+ * text_poke for early boot
+ */
+extern void *text_poke_early(void *addr, const void *opcode, size_t len);
+
#endif /* _ASM_X86_ALTERNATIVE_H */