Title: [8938] trunk: Fix bug[#6043] Select proper Kconfig option for NET_POLL
- Revision
- 8938
- Author
- sonicz
- Date
- 2010-06-24 06:26:00 -0400 (Thu, 24 Jun 2010)
Log Message
Fix bug[#6043] Select proper Kconfig option for NET_POLL
Unregister kgdboe module only when it is registered properly.
Modified Paths
Diff
Modified: trunk/drivers/net/kgdboe.c (8937 => 8938)
--- trunk/drivers/net/kgdboe.c 2010-06-24 10:05:32 UTC (rev 8937)
+++ trunk/drivers/net/kgdboe.c 2010-06-24 10:26:00 UTC (rev 8938)
@@ -217,8 +217,9 @@
static void cleanup_kgdboe(void)
{
netpoll_cleanup(&np);
+ if (configured == 2)
+ kgdb_unregister_io_module(&local_kgdb_io_ops);
configured = 0;
- kgdb_unregister_io_module(&local_kgdb_io_ops);
}
static int param_set_kgdboe_var(const char *kmessage, struct kernel_param *kp)
Modified: trunk/lib/Kconfig.kgdb (8937 => 8938)
--- trunk/lib/Kconfig.kgdb 2010-06-24 10:05:32 UTC (rev 8937)
+++ trunk/lib/Kconfig.kgdb 2010-06-24 10:26:00 UTC (rev 8938)
@@ -30,7 +30,7 @@
config KGDBOE
tristate "KGDB: On ethernet"
depends on KGDB
- select NETPOLL
+ select NETCONSOLE
select NETPOLL_TRAP
select NET_POLL_CONTROLLER
help
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
