]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/blob - src/patches/suse-2.6.27.31/patches.kabi/ftrace-dummy-export
Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
[people/teissler/ipfire-2.x.git] / src / patches / suse-2.6.27.31 / patches.kabi / ftrace-dummy-export
1 From: Michal Marek <mmarek@suse.cz>
2 Subject: Add mcount() dummy export
3
4 Export a stub to avoid changing kabi checksums after CONFIG_FTRACE has been
5 disabled.
6
7 Signed-off-by: Michal Marek <mmarek@suse.cz>
8 ---
9 arch/x86/kernel/i386_ksyms_32.c | 4 ++++
10 arch/x86/kernel/x8664_ksyms_64.c | 4 ++++
11 2 files changed, 8 insertions(+)
12
13 --- a/arch/x86/kernel/i386_ksyms_32.c
14 +++ b/arch/x86/kernel/i386_ksyms_32.c
15 @@ -8,6 +8,10 @@
16 #ifdef CONFIG_FTRACE
17 /* mcount is defined in assembly */
18 EXPORT_SYMBOL(mcount);
19 +#else
20 +/* export a stub for kabi compatibility */
21 +void mcount(void) { }
22 +EXPORT_SYMBOL(mcount);
23 #endif
24
25 /* Networking helper routines. */
26 --- a/arch/x86/kernel/x8664_ksyms_64.c
27 +++ b/arch/x86/kernel/x8664_ksyms_64.c
28 @@ -15,6 +15,10 @@
29 #ifdef CONFIG_FTRACE
30 /* mcount is defined in assembly */
31 EXPORT_SYMBOL(mcount);
32 +#else
33 +/* export a stub for kabi compatibility */
34 +void mcount(void) { }
35 +EXPORT_SYMBOL(mcount);
36 #endif
37
38 EXPORT_SYMBOL(kernel_thread);