diff options
| author | Anton Vorontsov <cbouatmailru@gmail.com> | 2008-07-29 18:05:23 -0400 |
|---|---|---|
| committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2008-07-29 18:05:23 -0400 |
| commit | 9fec6060d9e48ed7db0dac0e16d0f0f0e615b7f6 (patch) | |
| tree | 74b41f31a08f6500ff3dfcf64ba21e2d9a8e87e5 /include/asm-x86/alternative.h | |
| parent | fece418418f51e92dd7e67e17c5e3fe5a28d3279 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge branch 'master' of /home/cbou/linux-2.6
Conflicts:
drivers/power/Kconfig
drivers/power/Makefile
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 1f6a9ca1012..f6aa18eadf7 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) {} | |||
| 72 | static inline void alternatives_smp_switch(int smp) {} | 72 | static inline void alternatives_smp_switch(int smp) {} |
| 73 | #endif /* CONFIG_SMP */ | 73 | #endif /* CONFIG_SMP */ |
| 74 | 74 | ||
| 75 | const unsigned char *const *find_nop_table(void); | ||
| 76 | |||
| 75 | /* | 77 | /* |
| 76 | * Alternative instructions for different CPU types or capabilities. | 78 | * Alternative instructions for different CPU types or capabilities. |
| 77 | * | 79 | * |