diff options
| author | Linus Torvalds | 2019-07-09 21:08:15 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2019-07-09 21:08:15 +0200 |
| commit | 593c75463ab6d6985cdc9916f3d1c28b5f6340cd (patch) | |
| tree | fead1a52de9609ccd841bc4caa3a2ea44ddff932 /include/asm-generic | |
| parent | Merge branch 'x86-kdump-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | parisc: asm: psw.h: missing header guard (diff) | |
| download | kernel-qcow2-linux-593c75463ab6d6985cdc9916f3d1c28b5f6340cd.tar.gz kernel-qcow2-linux-593c75463ab6d6985cdc9916f3d1c28b5f6340cd.tar.xz kernel-qcow2-linux-593c75463ab6d6985cdc9916f3d1c28b5f6340cd.zip | |
Merge branch 'parisc-5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc updates from Helge Deller:
"Dynamic ftrace support by Sven Schnelle and a header guard fix by
Denis Efremov"
* 'parisc-5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: asm: psw.h: missing header guard
parisc: add dynamic ftrace
compiler.h: add CC_USING_PATCHABLE_FUNCTION_ENTRY
parisc: use pr_debug() in kernel/module.c
parisc: add WARN_ON() to clear_fixmap
parisc: add spinlock to patch function
parisc: add support for patching multiple words
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/vmlinux.lds.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 088987e9a3ea..ca42182992a5 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -110,10 +110,17 @@ #endif #ifdef CONFIG_FTRACE_MCOUNT_RECORD +#ifdef CC_USING_PATCHABLE_FUNCTION_ENTRY +#define MCOUNT_REC() . = ALIGN(8); \ + __start_mcount_loc = .; \ + KEEP(*(__patchable_function_entries)) \ + __stop_mcount_loc = .; +#else #define MCOUNT_REC() . = ALIGN(8); \ __start_mcount_loc = .; \ KEEP(*(__mcount_loc)) \ __stop_mcount_loc = .; +#endif #else #define MCOUNT_REC() #endif |