From dc88858d1a49e83c159cc2dd5c3b340b5df31da9 Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Sun, 23 Mar 2008 01:01:37 -0700
Subject: [PATCH] --- yaml --- r: 88918 b: refs/heads/master c:
 2ac1ea7ccd81f0383c6525e495a31d18fcac92db h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/include/asm-x86/alternative.h | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 860f9b3c4b71..95706dc0b01e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8dbeeb24e4d64a8a4bb49d54a6e4d987b9d3b6fc
+refs/heads/master: 2ac1ea7ccd81f0383c6525e495a31d18fcac92db
diff --git a/trunk/include/asm-x86/alternative.h b/trunk/include/asm-x86/alternative.h
index d26416b5722c..1f6a9ca10126 100644
--- a/trunk/include/asm-x86/alternative.h
+++ b/trunk/include/asm-x86/alternative.h
@@ -66,8 +66,8 @@ 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 */
@@ -148,9 +148,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