Attachment 148483 Details for Bug 229483 – Upstream fix for this issue

[patch] Upstream fix for this issue

usbmon.patch (text/plain), 1.63 KB, created by Prarit Bhargava on 2007-02-21 14:31:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Prarit Bhargava

Created: 2007-02-21 14:31:03 UTC

Size: 1.63 KB

patch

obsolete

>Remove __exit from mon_bin_exit & mon_text_exit.  Both functions are used
>in error code paths in __init functions.
>
>Resolves MODPOST warnings similar to:
>
>`mon_bin_exit' referenced in section `.init.text' of drivers/built-in.o: defined in discarded section `.exit.text' of drivers/built-in.o
>`mon_text_exit' referenced in section `.init.text' of drivers/built-in.o: defined in discarded section `.exit.text' of drivers/built-in.o
>make: *** [.tmp_vmlinux1] Error 1
>
>Signed-off-by: Prarit Bhargava <prarit@redhat.com>
>
>diff --git a/drivers/usb/mon/mon_bin.c b/drivers/usb/mon/mon_bin.c
>index c01dfe6..b2bedd9 100644
>--- a/drivers/usb/mon/mon_bin.c
>+++ b/drivers/usb/mon/mon_bin.c
>@@ -1165,7 +1165,7 @@ err_dev:
> 	return rc;
> }
> 
>-void __exit mon_bin_exit(void)
>+void mon_bin_exit(void)
> {
> 	cdev_del(&mon_bin_cdev);
> 	unregister_chrdev_region(mon_bin_dev0, MON_BIN_MAX_MINOR);
>diff --git a/drivers/usb/mon/mon_text.c b/drivers/usb/mon/mon_text.c
>index d38a127..494ee3b 100644
>--- a/drivers/usb/mon/mon_text.c
>+++ b/drivers/usb/mon/mon_text.c
>@@ -520,7 +520,7 @@ int __init mon_text_init(void)
> 	return 0;
> }
> 
>-void __exit mon_text_exit(void)
>+void mon_text_exit(void)
> {
> 	debugfs_remove(mon_dir);
> }
>diff --git a/drivers/usb/mon/usb_mon.h b/drivers/usb/mon/usb_mon.h
>index 4f949ce..efdfd89 100644
>--- a/drivers/usb/mon/usb_mon.h
>+++ b/drivers/usb/mon/usb_mon.h
>@@ -57,9 +57,9 @@ void mon_text_del(struct mon_bus *mbus);
> // void mon_bin_add(struct mon_bus *);
> 
> int __init mon_text_init(void);
>-void __exit mon_text_exit(void);
>+void mon_text_exit(void);
> int __init mon_bin_init(void);
>-void __exit mon_bin_exit(void);
>+void mon_bin_exit(void);
> 
> /*
>  * DMA interface.

Actions: View | Diff

Attachments on bug 229483: 148483 | 148487