From a41984e726601b2f6cf61e3128aba84f7a85436c Mon Sep 17 00:00:00 2001 From: Justus Winter <4winter@informatik.uni-hamburg.de> Date: Thu, 5 Nov 2015 23:46:06 +0100 Subject: sync with upstream packaging --- libdde-linux26/include/linux/device.h | 5 ++++- libdde-linux26/include/linux/kernel.h | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'libdde-linux26/include/linux') diff --git a/libdde-linux26/include/linux/device.h b/libdde-linux26/include/linux/device.h index 41b4227d..3dc6e94e 100644 --- a/libdde-linux26/include/linux/device.h +++ b/libdde-linux26/include/linux/device.h @@ -553,7 +553,10 @@ extern const char *dev_driver_string(const struct device *dev); printk(level "%s %s: " format , dev_driver_string(dev) , \ dev_name(dev) , ## arg) #else -#define dev_printk(level, dev, format, arg...) +#include +#define dev_printk(level, dev, format, arg...) \ + fprintf(stderr, level "%s %s: " format, \ + dev_driver_string(dev), dev_name(dev), ## arg) #endif #define dev_emerg(dev, format, arg...) \ diff --git a/libdde-linux26/include/linux/kernel.h b/libdde-linux26/include/linux/kernel.h index 573ed07c..63549398 100644 --- a/libdde-linux26/include/linux/kernel.h +++ b/libdde-linux26/include/linux/kernel.h @@ -363,6 +363,8 @@ static inline char *pack_hex_byte(char *buf, u8 byte) printk(KERN_NOTICE pr_fmt(fmt), ##__VA_ARGS__) #define pr_info(fmt, ...) \ printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__) +#define pr_cont(fmt, ...) \ + printk(KERN_CONT fmt, ##__VA_ARGS__) #if defined(DEBUG) #ifndef DDE_LINUX -- cgit v1.2.3