lkml.org 
[lkml]   [2009]   [Dec]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH -next] kmsg_dump: fix build for CONFIG_PRINTK=n
    On Tue, 01 Dec 2009 10:52:02 -0800
    Randy Dunlap <randy.dunlap@oracle.com> wrote:

    > From: Randy Dunlap <randy.dunlap@oracle.com>
    >
    > kmsg_dump() fails to build when CONFIG_PRINTK=n; provide stubs
    > for the kmsg_dump*() functions when CONFIG_PRINTK=n.
    >
    > kernel/printk.c: In function 'kmsg_dump':
    > kernel/printk.c:1501: error: 'log_buf_len' undeclared (first use in this function)
    > kernel/printk.c:1502: error: 'logged_chars' undeclared (first use in this function)
    > kernel/printk.c:1506: error: 'log_buf' undeclared (first use in this function)
    >
    > Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>

    Acked-by: Simon Kagstrom <simon.kagstrom@netinsight.net>

    David/Artem: Will you take Randys patch
    (http://lkml.org/lkml/2009/12/1/313) into your tree as well?

    // Simon

    > Cc: Simon Kagstrom <simon.kagstrom@netinsight.net>
    > ---
    > include/linux/kmsg_dump.h | 16 ++++++++++++++++
    > kernel/printk.c | 2 +-
    > 2 files changed, 17 insertions(+), 1 deletion(-)
    >
    > --- linux-next-20091201.orig/kernel/printk.c
    > +++ linux-next-20091201/kernel/printk.c
    > @@ -1406,7 +1406,6 @@ bool printk_timed_ratelimit(unsigned lon
    > return false;
    > }
    > EXPORT_SYMBOL(printk_timed_ratelimit);
    > -#endif
    >
    > static DEFINE_SPINLOCK(dump_list_lock);
    > static LIST_HEAD(dump_list);
    > @@ -1525,3 +1524,4 @@ void kmsg_dump(enum kmsg_dump_reason rea
    > dumper->dump(dumper, reason, s1, l1, s2, l2);
    > spin_unlock_irqrestore(&dump_list_lock, flags);
    > }
    > +#endif
    > --- linux-next-20091201.orig/include/linux/kmsg_dump.h
    > +++ linux-next-20091201/include/linux/kmsg_dump.h
    > @@ -35,10 +35,26 @@ struct kmsg_dumper {
    > int registered;
    > };
    >
    > +#ifdef CONFIG_PRINTK
    > void kmsg_dump(enum kmsg_dump_reason reason);
    >
    > int kmsg_dump_register(struct kmsg_dumper *dumper);
    >
    > int kmsg_dump_unregister(struct kmsg_dumper *dumper);
    > +#else
    > +static inline void kmsg_dump(enum kmsg_dump_reason reason)
    > +{
    > +}
    > +
    > +static inline int kmsg_dump_register(struct kmsg_dumper *dumper)
    > +{
    > + return -EINVAL;
    > +}
    > +
    > +static inline int kmsg_dump_unregister(struct kmsg_dumper *dumper)
    > +{
    > + return -EINVAL;
    > +}
    > +#endif
    >
    > #endif /* _LINUX_KMSG_DUMP_H */



    \
     
     \ /
      Last update: 2009-12-02 09:37    [W:0.030 / U:30.332 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site