diff options
| author | Borislav Petkov <bp@suse.de> | 2021-06-23 18:42:12 +0300 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2021-06-23 18:43:38 +0300 |
| commit | c4cf5f61982e35348f522464010445efcc0aeb60 (patch) | |
| tree | b3e65bfae5786e33ac82b30d6801983b10934a2f /include/linux/dynamic_debug.h | |
| parent | b7c11876d24bdd7ae3feeaa771b8f903f6cf05eb (diff) | |
| parent | f9dfb5e390fab2df9f7944bb91e7705aba14cd26 (diff) | |
| download | linux-c4cf5f61982e35348f522464010445efcc0aeb60.tar.xz | |
Merge x86/urgent into x86/fpu
Pick up dependent changes which either went mainline (x86/urgent is
based on -rc7 and that contains them) as urgent fixes and the current
x86/urgent branch which contains two more urgent fixes, so that the
bigger FPU rework can base off ontop.
Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'include/linux/dynamic_debug.h')
| -rw-r--r-- | include/linux/dynamic_debug.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h index a57ee75342cf..dce631e678dd 100644 --- a/include/linux/dynamic_debug.h +++ b/include/linux/dynamic_debug.h @@ -32,6 +32,11 @@ struct _ddebug { #define _DPRINTK_FLAGS_INCL_FUNCNAME (1<<2) #define _DPRINTK_FLAGS_INCL_LINENO (1<<3) #define _DPRINTK_FLAGS_INCL_TID (1<<4) + +#define _DPRINTK_FLAGS_INCL_ANY \ + (_DPRINTK_FLAGS_INCL_MODNAME | _DPRINTK_FLAGS_INCL_FUNCNAME |\ + _DPRINTK_FLAGS_INCL_LINENO | _DPRINTK_FLAGS_INCL_TID) + #if defined DEBUG #define _DPRINTK_FLAGS_DEFAULT _DPRINTK_FLAGS_PRINT #else |