diff options
| author | David S. Miller <davem@davemloft.net> | 2018-09-12 22:22:42 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-09-12 22:22:42 -0700 |
| commit | aaf9253025e80cf8f62d7b33670e84e838eec5a3 (patch) | |
| tree | f13b307c8407cc05ff803c4d7f6a0967d85ce3ec /kernel/printk/printk_safe.c | |
| parent | a20625e49ddefc250c221478fb0dc62ea27722a6 (diff) | |
| parent | 7428b2e5d0b195f2a5e40f91d2b41a8503fcfe68 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'kernel/printk/printk_safe.c')
| -rw-r--r-- | kernel/printk/printk_safe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/printk/printk_safe.c b/kernel/printk/printk_safe.c index a0a74c533e4b..0913b4d385de 100644 --- a/kernel/printk/printk_safe.c +++ b/kernel/printk/printk_safe.c @@ -306,12 +306,12 @@ static __printf(1, 0) int vprintk_nmi(const char *fmt, va_list args) return printk_safe_log_store(s, fmt, args); } -void printk_nmi_enter(void) +void notrace printk_nmi_enter(void) { this_cpu_or(printk_context, PRINTK_NMI_CONTEXT_MASK); } -void printk_nmi_exit(void) +void notrace printk_nmi_exit(void) { this_cpu_and(printk_context, ~PRINTK_NMI_CONTEXT_MASK); } |