diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2008-05-12 21:20:43 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2008-05-23 20:33:28 +0200 |
| commit | dfa60aba04dae7833d75b2e2be124bb7cfb8239f (patch) | |
| tree | 6aebf657355b5e2132e94420712f55e52eb35c62 /arch/x86/kernel/alternative.c | |
| parent | b0fc494fae96a7089f3651cb451f461c7291244c (diff) | |
| download | blackbird-op-linux-dfa60aba04dae7833d75b2e2be124bb7cfb8239f.tar.gz blackbird-op-linux-dfa60aba04dae7833d75b2e2be124bb7cfb8239f.zip | |
ftrace: use nops instead of jmp
This patch patches the call to mcount with nops instead
of a jmp over the mcount call.
Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/alternative.c')
| -rw-r--r-- | arch/x86/kernel/alternative.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c index 65c7857a90dd..de240ba2e288 100644 --- a/arch/x86/kernel/alternative.c +++ b/arch/x86/kernel/alternative.c @@ -143,7 +143,7 @@ static const unsigned char *const p6_nops[ASM_NOP_MAX+1] = { #ifdef CONFIG_X86_64 extern char __vsyscall_0; -static inline const unsigned char*const * find_nop_table(void) +const unsigned char *const *find_nop_table(void) { return boot_cpu_data.x86_vendor != X86_VENDOR_INTEL || boot_cpu_data.x86 < 6 ? k8_nops : p6_nops; @@ -162,7 +162,7 @@ static const struct nop { { -1, NULL } }; -static const unsigned char*const * find_nop_table(void) +const unsigned char *const *find_nop_table(void) { const unsigned char *const *noptable = intel_nops; int i; |
