diff options
Diffstat (limited to 'include/asm-x86')
-rw-r--r-- | include/asm-x86/alternative.h | 2 | ||||
-rw-r--r-- | include/asm-x86/ftrace.h | 14 | ||||
-rw-r--r-- | include/asm-x86/irqflags.h | 24 | ||||
-rw-r--r-- | include/asm-x86/vsyscall.h | 3 |
4 files changed, 20 insertions, 23 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) {} | |||
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 | * |
diff --git a/include/asm-x86/ftrace.h b/include/asm-x86/ftrace.h new file mode 100644 index 000000000000..c184441133f2 --- /dev/null +++ b/include/asm-x86/ftrace.h | |||
@@ -0,0 +1,14 @@ | |||
1 | #ifndef _ASM_X86_FTRACE | ||
2 | #define _ASM_SPARC64_FTRACE | ||
3 | |||
4 | #ifdef CONFIG_FTRACE | ||
5 | #define MCOUNT_ADDR ((long)(mcount)) | ||
6 | #define MCOUNT_INSN_SIZE 5 /* sizeof mcount call */ | ||
7 | |||
8 | #ifndef __ASSEMBLY__ | ||
9 | extern void mcount(void); | ||
10 | #endif | ||
11 | |||
12 | #endif /* CONFIG_FTRACE */ | ||
13 | |||
14 | #endif /* _ASM_X86_FTRACE */ | ||
diff --git a/include/asm-x86/irqflags.h b/include/asm-x86/irqflags.h index 17e7a1701c97..424acb48cd61 100644 --- a/include/asm-x86/irqflags.h +++ b/include/asm-x86/irqflags.h | |||
@@ -190,8 +190,6 @@ static inline void trace_hardirqs_fixup(void) | |||
190 | #else | 190 | #else |
191 | 191 | ||
192 | #ifdef CONFIG_X86_64 | 192 | #ifdef CONFIG_X86_64 |
193 | #define ARCH_TRACE_IRQS_ON call trace_hardirqs_on_thunk | ||
194 | #define ARCH_TRACE_IRQS_OFF call trace_hardirqs_off_thunk | ||
195 | #define ARCH_LOCKDEP_SYS_EXIT call lockdep_sys_exit_thunk | 193 | #define ARCH_LOCKDEP_SYS_EXIT call lockdep_sys_exit_thunk |
196 | #define ARCH_LOCKDEP_SYS_EXIT_IRQ \ | 194 | #define ARCH_LOCKDEP_SYS_EXIT_IRQ \ |
197 | TRACE_IRQS_ON; \ | 195 | TRACE_IRQS_ON; \ |
@@ -203,24 +201,6 @@ static inline void trace_hardirqs_fixup(void) | |||
203 | TRACE_IRQS_OFF; | 201 | TRACE_IRQS_OFF; |
204 | 202 | ||
205 | #else | 203 | #else |
206 | #define ARCH_TRACE_IRQS_ON \ | ||
207 | pushl %eax; \ | ||
208 | pushl %ecx; \ | ||
209 | pushl %edx; \ | ||
210 | call trace_hardirqs_on; \ | ||
211 | popl %edx; \ | ||
212 | popl %ecx; \ | ||
213 | popl %eax; | ||
214 | |||
215 | #define ARCH_TRACE_IRQS_OFF \ | ||
216 | pushl %eax; \ | ||
217 | pushl %ecx; \ | ||
218 | pushl %edx; \ | ||
219 | call trace_hardirqs_off; \ | ||
220 | popl %edx; \ | ||
221 | popl %ecx; \ | ||
222 | popl %eax; | ||
223 | |||
224 | #define ARCH_LOCKDEP_SYS_EXIT \ | 204 | #define ARCH_LOCKDEP_SYS_EXIT \ |
225 | pushl %eax; \ | 205 | pushl %eax; \ |
226 | pushl %ecx; \ | 206 | pushl %ecx; \ |
@@ -234,8 +214,8 @@ static inline void trace_hardirqs_fixup(void) | |||
234 | #endif | 214 | #endif |
235 | 215 | ||
236 | #ifdef CONFIG_TRACE_IRQFLAGS | 216 | #ifdef CONFIG_TRACE_IRQFLAGS |
237 | # define TRACE_IRQS_ON ARCH_TRACE_IRQS_ON | 217 | # define TRACE_IRQS_ON call trace_hardirqs_on_thunk; |
238 | # define TRACE_IRQS_OFF ARCH_TRACE_IRQS_OFF | 218 | # define TRACE_IRQS_OFF call trace_hardirqs_off_thunk; |
239 | #else | 219 | #else |
240 | # define TRACE_IRQS_ON | 220 | # define TRACE_IRQS_ON |
241 | # define TRACE_IRQS_OFF | 221 | # define TRACE_IRQS_OFF |
diff --git a/include/asm-x86/vsyscall.h b/include/asm-x86/vsyscall.h index 17b3700949bf..6b66ff905af0 100644 --- a/include/asm-x86/vsyscall.h +++ b/include/asm-x86/vsyscall.h | |||
@@ -24,7 +24,8 @@ enum vsyscall_num { | |||
24 | ((unused, __section__ (".vsyscall_gtod_data"),aligned(16))) | 24 | ((unused, __section__ (".vsyscall_gtod_data"),aligned(16))) |
25 | #define __section_vsyscall_clock __attribute__ \ | 25 | #define __section_vsyscall_clock __attribute__ \ |
26 | ((unused, __section__ (".vsyscall_clock"),aligned(16))) | 26 | ((unused, __section__ (".vsyscall_clock"),aligned(16))) |
27 | #define __vsyscall_fn __attribute__ ((unused,__section__(".vsyscall_fn"))) | 27 | #define __vsyscall_fn \ |
28 | __attribute__ ((unused, __section__(".vsyscall_fn"))) notrace | ||
28 | 29 | ||
29 | #define VGETCPU_RDTSCP 1 | 30 | #define VGETCPU_RDTSCP 1 |
30 | #define VGETCPU_LSL 2 | 31 | #define VGETCPU_LSL 2 |