1 files changed, 18 insertions, 18 deletions
diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
index 70780689599a..58ed6d96a6ac 100644
--- a/arch/x86/include/asm/alternative.h
+++ b/arch/x86/include/asm/alternative.h
@@ -29,10 +29,10 @@
 #ifdef CONFIG_SMP
 #define LOCK_PREFIX_HERE \
-                ".section .smp_locks,\"a\"\n"   \
+                ".pushsection .smp_locks,\"a\"\n"       \
-                ".balign 4\n"                   \
+                ".balign 4\n"                           \
-                ".long 671f - .\n" /* offset */ \
+                ".long 671f - .\n" /* offset */         \
-                ".previous\n"                   \
+                ".popsection\n"                         \
                "671:"
 #define LOCK_PREFIX LOCK_PREFIX_HERE "\n\tlock; "
@@ -60,7 +60,7 @@ extern void alternatives_smp_module_add(struct module *mod, char *name,
                                        void *locks, void *locks_end,
                                        void *text, void *text_end);
 extern void alternatives_smp_module_del(struct module *mod);
-extern void alternatives_smp_switch(int smp);
+extern void alternatives_enable_smp(void);
 extern int alternatives_text_reserved(void *start, void *end);
 extern bool skip_smp_alternatives;
 #else
@@ -68,7 +68,7 @@ static inline void alternatives_smp_module_add(struct module *mod, char *name,
                                               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) {}
+static inline void alternatives_enable_smp(void) {}
 static inline int alternatives_text_reserved(void *start, void *end)
 {
        return 0;
@@ -99,30 +99,30 @@ static inline int alternatives_text_reserved(void *start, void *end)
 /* alternative assembly primitive: */
 #define ALTERNATIVE(oldinstr, newinstr, feature)                        \
        OLDINSTR(oldinstr)                                              \
-        ".section .altinstructions,\"a\"\n"                             \
+        ".pushsection .altinstructions,\"a\"\n"                         \
        ALTINSTR_ENTRY(feature, 1)                                      \
-        ".previous\n"                                                   \
+        ".popsection\n"                                                 \
-        ".section .discard,\"aw\",@progbits\n"                          \
+        ".pushsection .discard,\"aw\",@progbits\n"                      \
        DISCARD_ENTRY(1)                                                \
-        ".previous\n"                                                   \
+        ".popsection\n"                                                 \
-        ".section .altinstr_replacement, \"ax\"\n"                      \
+        ".pushsection .altinstr_replacement, \"ax\"\n"                  \
        ALTINSTR_REPLACEMENT(newinstr, feature, 1)                      \
-        ".previous"
+        ".popsection"
 #define ALTERNATIVE_2(oldinstr, newinstr1, feature1, newinstr2, feature2)\
        OLDINSTR(oldinstr)                                              \
-        ".section .altinstructions,\"a\"\n"                             \
+        ".pushsection .altinstructions,\"a\"\n"                         \
        ALTINSTR_ENTRY(feature1, 1)                                     \
        ALTINSTR_ENTRY(feature2, 2)                                     \
-        ".previous\n"                                                   \
+        ".popsection\n"                                                 \
-        ".section .discard,\"aw\",@progbits\n"                          \
+        ".pushsection .discard,\"aw\",@progbits\n"                      \
        DISCARD_ENTRY(1)                                                \
        DISCARD_ENTRY(2)                                                \
-        ".previous\n"                                                   \
+        ".popsection\n"                                                 \
-        ".section .altinstr_replacement, \"ax\"\n"                      \
+        ".pushsection .altinstr_replacement, \"ax\"\n"                  \
        ALTINSTR_REPLACEMENT(newinstr1, feature1, 1)                    \
        ALTINSTR_REPLACEMENT(newinstr2, feature2, 2)                    \
-        ".previous"
+        ".popsection"
 /*
 * This must be included *after* the definition of ALTERNATIVE due to

diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h index 70780689599a..58ed6d96a6ac 100644 --- a/arch/x86/include/asm/alternative.h +++ b/arch/x86/include/asm/alternative.h
@@ -29,10 +29,10 @@
29		29
30	#ifdef CONFIG_SMP	30	#ifdef CONFIG_SMP
31	#define LOCK_PREFIX_HERE \	31	#define LOCK_PREFIX_HERE \
32	".section .smp_locks,\"a\"\n" \	32	".pushsection .smp_locks,\"a\"\n" \
33	".balign 4\n" \	33	".balign 4\n" \
34	".long 671f - .\n" /* offset */ \	34	".long 671f - .\n" /* offset */ \
35	".previous\n" \	35	".popsection\n" \
36	"671:"	36	"671:"
37		37
38	#define LOCK_PREFIX LOCK_PREFIX_HERE "\n\tlock; "	38	#define LOCK_PREFIX LOCK_PREFIX_HERE "\n\tlock; "
@@ -60,7 +60,7 @@ extern void alternatives_smp_module_add(struct module mod, char name,
60	void locks, void locks_end,	60	void locks, void locks_end,
61	void text, void text_end);	61	void text, void text_end);
62	extern void alternatives_smp_module_del(struct module *mod);	62	extern void alternatives_smp_module_del(struct module *mod);
63	extern void alternatives_smp_switch(int smp);	63	extern void alternatives_enable_smp(void);
64	extern int alternatives_text_reserved(void start, void end);	64	extern int alternatives_text_reserved(void start, void end);
65	extern bool skip_smp_alternatives;	65	extern bool skip_smp_alternatives;
66	#else	66	#else
@@ -68,7 +68,7 @@ static inline void alternatives_smp_module_add(struct module mod, char name,
68	void locks, void locks_end,	68	void locks, void locks_end,
69	void text, void text_end) {}	69	void text, void text_end) {}
70	static inline void alternatives_smp_module_del(struct module *mod) {}	70	static inline void alternatives_smp_module_del(struct module *mod) {}
71	static inline void alternatives_smp_switch(int smp) {}	71	static inline void alternatives_enable_smp(void) {}
72	static inline int alternatives_text_reserved(void start, void end)	72	static inline int alternatives_text_reserved(void start, void end)
73	{	73	{
74	return 0;	74	return 0;
@@ -99,30 +99,30 @@ static inline int alternatives_text_reserved(void start, void end)
99	/* alternative assembly primitive: */	99	/* alternative assembly primitive: */
100	#define ALTERNATIVE(oldinstr, newinstr, feature) \	100	#define ALTERNATIVE(oldinstr, newinstr, feature) \
101	OLDINSTR(oldinstr) \	101	OLDINSTR(oldinstr) \
102	".section .altinstructions,\"a\"\n" \	102	".pushsection .altinstructions,\"a\"\n" \
103	ALTINSTR_ENTRY(feature, 1) \	103	ALTINSTR_ENTRY(feature, 1) \
104	".previous\n" \	104	".popsection\n" \
105	".section .discard,\"aw\",@progbits\n" \	105	".pushsection .discard,\"aw\",@progbits\n" \
106	DISCARD_ENTRY(1) \	106	DISCARD_ENTRY(1) \
107	".previous\n" \	107	".popsection\n" \
108	".section .altinstr_replacement, \"ax\"\n" \	108	".pushsection .altinstr_replacement, \"ax\"\n" \
109	ALTINSTR_REPLACEMENT(newinstr, feature, 1) \	109	ALTINSTR_REPLACEMENT(newinstr, feature, 1) \
110	".previous"	110	".popsection"
111		111
112	#define ALTERNATIVE_2(oldinstr, newinstr1, feature1, newinstr2, feature2)\	112	#define ALTERNATIVE_2(oldinstr, newinstr1, feature1, newinstr2, feature2)\
113	OLDINSTR(oldinstr) \	113	OLDINSTR(oldinstr) \
114	".section .altinstructions,\"a\"\n" \	114	".pushsection .altinstructions,\"a\"\n" \
115	ALTINSTR_ENTRY(feature1, 1) \	115	ALTINSTR_ENTRY(feature1, 1) \
116	ALTINSTR_ENTRY(feature2, 2) \	116	ALTINSTR_ENTRY(feature2, 2) \
117	".previous\n" \	117	".popsection\n" \
118	".section .discard,\"aw\",@progbits\n" \	118	".pushsection .discard,\"aw\",@progbits\n" \
119	DISCARD_ENTRY(1) \	119	DISCARD_ENTRY(1) \
120	DISCARD_ENTRY(2) \	120	DISCARD_ENTRY(2) \
121	".previous\n" \	121	".popsection\n" \
122	".section .altinstr_replacement, \"ax\"\n" \	122	".pushsection .altinstr_replacement, \"ax\"\n" \
123	ALTINSTR_REPLACEMENT(newinstr1, feature1, 1) \	123	ALTINSTR_REPLACEMENT(newinstr1, feature1, 1) \
124	ALTINSTR_REPLACEMENT(newinstr2, feature2, 2) \	124	ALTINSTR_REPLACEMENT(newinstr2, feature2, 2) \
125	".previous"	125	".popsection"
126		126
127	/*	127	/*
128	* This must be included after the definition of ALTERNATIVE due to	128	* This must be included after the definition of ALTERNATIVE due to