lkml.org 
[lkml]   [2002]   [Nov]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    SubjectRe: [2.5-bk] Module loader compile bug
    Date
    In message <20021112050319.GA3651@paypal.com> you write:
    > I realize you're still working on this, but current bk is broken if
    > you turn off module unload support. In include/linux/module.h we get:
    >
    > #else /*!CONFIG_MODULE_UNLOAD*/
    > <snip>
    > #define symbol_put_addr(p) do { } while(0)
    >
    > #endif /* CONFIG_MODULE_UNLOAD */
    >
    > Which upsets this line in kernel/module.c
    >
    > void symbol_put_addr(void *addr)
    >
    > After the preprocessor gets a hold of it all, gcc doesn't know what to
    > make of "void do { } while(0)".

    Yep, symbol_put_addr() in module.c should be moved under __symbol_put.

    Patch is fairly trivial, does this work for you?
    Rusty.
    --
    Anyone who quotes me in their sig is an idiot. -- Rusty Russell.

    --- working-2.5.47-module-alias/kernel/module.c.~1~ 2002-11-12 22:10:43.000000000 +1100
    +++ working-2.5.47-module-alias/kernel/module.c 2002-11-13 04:22:47.000000000 +1100
    @@ -492,6 +492,28 @@ void __symbol_put(const char *symbol)
    }
    EXPORT_SYMBOL(__symbol_put);

    +void symbol_put_addr(void *addr)
    +{
    + struct kernel_symbol_group *ks;
    + unsigned long flags;
    +
    + spin_lock_irqsave(&modlist_lock, flags);
    + list_for_each_entry(ks, &symbols, list) {
    + unsigned int i;
    +
    + for (i = 0; i < ks->num_syms; i++) {
    + if (ks->syms[i].value == (unsigned long)addr) {
    + module_put(ks->owner);
    + spin_unlock_irqrestore(&modlist_lock, flags);
    + return;
    + }
    + }
    + }
    + spin_unlock_irqrestore(&modlist_lock, flags);
    + BUG();
    +}
    +EXPORT_SYMBOL_GPL(symbol_put_addr);
    +
    #else /* !CONFIG_MODULE_UNLOAD */
    static void print_unload_info(struct seq_file *m, struct module *mod)
    {
    @@ -716,28 +738,6 @@ void *__symbol_get(const char *symbol)
    }
    EXPORT_SYMBOL_GPL(__symbol_get);

    -void symbol_put_addr(void *addr)
    -{
    - struct kernel_symbol_group *ks;
    - unsigned long flags;
    -
    - spin_lock_irqsave(&modlist_lock, flags);
    - list_for_each_entry(ks, &symbols, list) {
    - unsigned int i;
    -
    - for (i = 0; i < ks->num_syms; i++) {
    - if (ks->syms[i].value == (unsigned long)addr) {
    - module_put(ks->owner);
    - spin_unlock_irqrestore(&modlist_lock, flags);
    - return;
    - }
    - }
    - }
    - spin_unlock_irqrestore(&modlist_lock, flags);
    - BUG();
    -}
    -EXPORT_SYMBOL_GPL(symbol_put_addr);
    -
    /* Transfer one ELF section to the correct (init or core) area. */
    static void *copy_section(const char *name,
    void *base,
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2005-03-22 13:30    [W:0.047 / U:0.532 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site