diff options
| author | Anton Vorontsov <anton@enomsg.org> | 2013-03-24 20:06:35 -0700 |
|---|---|---|
| committer | Anton Vorontsov <anton@enomsg.org> | 2013-03-24 20:06:35 -0700 |
| commit | 6e997bb894beef128fcfe1679e0830f97dee6dc2 (patch) | |
| tree | 078d95af4d30b5e3d5b1db18de215489b26e01ce /include/linux/printk.h | |
| parent | c6cc9fc9d42ec82da2c770f0bef1488dc467f29c (diff) | |
| parent | 92413a9bee1299cedcc0e5cfbfbc6b42496fb817 (diff) | |
| download | lwn-6e997bb894beef128fcfe1679e0830f97dee6dc2.tar.gz lwn-6e997bb894beef128fcfe1679e0830f97dee6dc2.zip | |
Merge branch 'urgent'
Conflicts:
drivers/power/pm2301_charger.c
Diffstat (limited to 'include/linux/printk.h')
| -rw-r--r-- | include/linux/printk.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/printk.h b/include/linux/printk.h index 1249a54d17e0..822171fcb1c8 100644 --- a/include/linux/printk.h +++ b/include/linux/printk.h @@ -134,6 +134,8 @@ extern int printk_delay_msec; extern int dmesg_restrict; extern int kptr_restrict; +extern void wake_up_klogd(void); + void log_buf_kexec_setup(void); void __init setup_log_buf(int early); #else @@ -162,6 +164,10 @@ static inline bool printk_timed_ratelimit(unsigned long *caller_jiffies, return false; } +static inline void wake_up_klogd(void) +{ +} + static inline void log_buf_kexec_setup(void) { } |