Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / include / asm-x86 / alternative.h

diff --git a/include/asm-x86/alternative.h b/include/asm-x86/alternative.h
index d26416b5722c2c286d22337fdab20c6ccaa2a54d..f6aa18eadf71717d9e86c53ac3719776fa035969 100644 (file)
--- a/include/asm-x86/alternative.h
+++ b/include/asm-x86/alternative.h
@@ -66,12 +66,14 @@ extern void alternatives_smp_module_del(struct module *mod);
 extern void alternatives_smp_switch(int smp);
 #else
 static inline void alternatives_smp_module_add(struct module *mod, char *name,
-                                       void *locks, void *locks_end,
-                                       void *text, void *text_end) {}
+                                              void *locks, void *locks_end,
+                                              void *text, void *text_end) {}
 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.
  *
@@ -148,9 +150,8 @@ struct paravirt_patch_site;
 void apply_paravirt(struct paravirt_patch_site *start,
                    struct paravirt_patch_site *end);
 #else
-static inline void
-apply_paravirt(struct paravirt_patch_site *start,
-              struct paravirt_patch_site *end)
+static inline void apply_paravirt(struct paravirt_patch_site *start,
+                                 struct paravirt_patch_site *end)
 {}
 #define __parainstructions     NULL
 #define __parainstructions_end NULL