summaryrefslogtreecommitdiff
path: root/include/asm-x86/alternative.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-19 00:50:34 +0400
committerIngo Molnar <mingo@elte.hu>2008-07-19 00:50:34 +0400
commita208f37a465e222218974ab20a31b42b7b4893b2 (patch)
tree77c6acdd4be32024330a14f2618b814126ce7a20 /include/asm-x86/alternative.h
parent511d9d34183662aada3890883e860b151d707e22 (diff)
parent5b664cb235e97afbf34db9c4d77f08ebd725335e (diff)
downloadlinux-a208f37a465e222218974ab20a31b42b7b4893b2.tar.xz
Merge branch 'linus' into x86/x2apic
Diffstat (limited to 'include/asm-x86/alternative.h')
-rw-r--r--include/asm-x86/alternative.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-x86/alternative.h b/include/asm-x86/alternative.h
index 1f6a9ca10126..f6aa18eadf71 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.
*