diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-25 18:18:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-25 18:18:04 -0700 |
| commit | 36e635cb21d96da0f30b91a39cc95ef4ed1bce26 (patch) | |
| tree | c28397756f579bbd23f1570ca612772c02cfbab2 /include | |
| parent | c265cc5c3cb2e950910437a846ef59e3a5c2df51 (diff) | |
| parent | 81c2949f7fdcf8ff681326669afde24962232670 (diff) | |
| download | linux-36e635cb21d96da0f30b91a39cc95ef4ed1bce26.tar.gz linux-36e635cb21d96da0f30b91a39cc95ef4ed1bce26.tar.bz2 linux-36e635cb21d96da0f30b91a39cc95ef4ed1bce26.zip | |
Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 stackdump update from Ingo Molnar:
"A number of stackdump enhancements"
* 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/dumpstack: Add show_stack_regs() and use it
printk: Make the printk*once() variants return a value
x86/dumpstack: Honor supplied @regs arg
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/printk.h | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/include/linux/printk.h b/include/linux/printk.h index f4da695fd615..f136b22c7772 100644 --- a/include/linux/printk.h +++ b/include/linux/printk.h @@ -108,11 +108,14 @@ struct va_format { * Dummy printk for disabled debugging statements to use whilst maintaining * gcc's format checking. */ -#define no_printk(fmt, ...) \ -do { \ - if (0) \ - printk(fmt, ##__VA_ARGS__); \ -} while (0) +#define no_printk(fmt, ...) \ +({ \ + do { \ + if (0) \ + printk(fmt, ##__VA_ARGS__); \ + } while (0); \ + 0; \ +}) #ifdef CONFIG_EARLY_PRINTK extern asmlinkage __printf(1, 2) @@ -309,20 +312,24 @@ extern asmlinkage void dump_stack(void) __cold; #define printk_once(fmt, ...) \ ({ \ static bool __print_once __read_mostly; \ + bool __ret_print_once = !__print_once; \ \ if (!__print_once) { \ __print_once = true; \ printk(fmt, ##__VA_ARGS__); \ } \ + unlikely(__ret_print_once); \ }) #define printk_deferred_once(fmt, ...) \ ({ \ static bool __print_once __read_mostly; \ + bool __ret_print_once = !__print_once; \ \ if (!__print_once) { \ __print_once = true; \ printk_deferred(fmt, ##__VA_ARGS__); \ } \ + unlikely(__ret_print_once); \ }) #else #define printk_once(fmt, ...) \ |