diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-14 16:11:52 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-14 16:11:52 +0200 |
| commit | 5806b81ac1c0c52665b91723fd4146a4f86e386b (patch) | |
| tree | 24ea8763bf308ce1407c1de91dc8de4d2655e1c1 /include/asm-x86/alternative.h | |
| parent | d14c8a680ccfdeb5e7b9be4d61162c2b373bd1e8 (diff) | |
| parent | 6712e299b7dc78aa4971b85e803435ee6d49a9dd (diff) | |
| download | op-kernel-dev-5806b81ac1c0c52665b91723fd4146a4f86e386b.zip op-kernel-dev-5806b81ac1c0c52665b91723fd4146a4f86e386b.tar.gz | |
Merge branch 'auto-ftrace-next' into tracing/for-linus
Conflicts:
arch/x86/kernel/entry_32.S
arch/x86/kernel/process_32.c
arch/x86/kernel/process_64.c
arch/x86/lib/Makefile
include/asm-x86/irqflags.h
kernel/Makefile
kernel/sched.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/alternative.h')
| -rw-r--r-- | include/asm-x86/alternative.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-x86/alternative.h b/include/asm-x86/alternative.h index 1f6a9ca..f6aa18e 100644 --- a/include/asm-x86/alternative.h +++ b/include/asm-x86/alternative.h @@ -72,6 +72,8 @@ static inline void alternatives_smp_module_del(struct module *mod) {} static inline void alternatives_smp_switch(int smp) {} #endif /* CONFIG_SMP */ +const unsigned char *const *find_nop_table(void); + /* * Alternative instructions for different CPU types or capabilities. * |
