lkml.org 
[lkml]   [2008]   [Dec]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] Make DEBUG take precedence over DYNAMIC_PRINTK_DEBUG.
    Statically defined DEBUG should take precedence over
    dynamically enabled debugging; otherwise adding DEBUG
    (like, for example, via CONFIG_DEBUG_KOBJECT) does not
    have the expected result of printing pr_debug() messages
    unconditionally.

    Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
    ---
    include/linux/kernel.h | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    --- linux-2.6.orig/include/linux/kernel.h
    +++ linux-2.6/include/linux/kernel.h
    @@ -338,13 +338,13 @@ static inline char *pack_hex_byte(char *
    printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__)

    /* If you are writing a driver, please use dev_dbg instead */
    -#if defined(CONFIG_DYNAMIC_PRINTK_DEBUG)
    +#if defined(DEBUG)
    +#define pr_debug(fmt, ...) \
    + printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)
    +#elif defined(CONFIG_DYNAMIC_PRINTK_DEBUG)
    #define pr_debug(fmt, ...) do { \
    dynamic_pr_debug(pr_fmt(fmt), ##__VA_ARGS__); \
    } while (0)
    -#elif defined(DEBUG)
    -#define pr_debug(fmt, ...) \
    - printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)
    #else
    #define pr_debug(fmt, ...) \
    ({ if (0) printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__); 0; })

    \
     
     \ /
      Last update: 2008-12-04 13:55    [W:4.240 / U:0.500 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site