• Samuel Ortiz's avatar
    [IrDA]: Fix IrDA build failure · 75a69ac6
    Samuel Ortiz authored
    When having built-in IrDA, we hit the following error:
    
    `irda_sysctl_unregister' referenced in section `.init.text' of
    net/built-in.o: defined in discarded section `.exit.text' of
    net/built-in.o
    `irda_proc_unregister' referenced in section `.init.text' of
    net/built-in.o: defined in discarded section `.exit.text' of
    net/built-in.o
    `irsock_cleanup' referenced in section `.init.text' of net/built-in.o:
    defined in discarded section `.exit.text' of net/built-in.o
    `irttp_cleanup' referenced in section `.init.text' of net/built-in.o:
    defined in discarded section `.exit.text' of net/built-in.o
    `iriap_cleanup' referenced in section `.init.text' of net/built-in.o:
    defined in discarded section `.exit.text' of net/built-in.o
    `irda_device_cleanup' referenced in section `.init.text' of
    net/built-in.o: defined in discarded section `.exit.text' of
    net/built-in.o
    `irlap_cleanup' referenced in section `.init.text' of net/built-in.o:
    defined in discarded section `.exit.text' of net/built-in.o
    `irlmp_cleanup' referenced in section `.init.text' of net/built-in.o:
    defined in discarded section `.exit.text' of net/built-in.o
    make[1]: *** [.tmp_vmlinux1] Error 1
    make: *** [_all] Error 2
    
    This is due to the irda_init fix recently added, where we call __exit
    routines from an __init one. It is a build failure that I didn't catch
    because it doesn't show up when building IrDA as a module. My apologies
    for that.
    The following patch fixes that failure and is against your net-2.6
    tree. I hope it can make it to the merge window, and stable@kernel.org
    is CCed on this mail.
    Signed-off-by: default avatarSamuel Ortiz <samuel@sortiz.org>
    Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    75a69ac6
af_irda.c 66.2 KB