Commit f64205a4 authored by Aaron Tomlin's avatar Aaron Tomlin Committed by Luis Chamberlain
Browse files

module: Move kdb module related code out of main kdb code 



No functional change.

This patch migrates the kdb 'lsmod' command support out of main
kdb code into its own file under kernel/module. In addition to
the above, a minor style warning i.e. missing a blank line after
declarations, was resolved too. The new file was added to
MAINTAINERS. Finally we remove linux/module.h as it is entirely
redundant.

Reviewed-by: default avatarDaniel Thompson <daniel.thompson@linaro.org>
Acked-by: default avatarDaniel Thompson <daniel.thompson@linaro.org>
Signed-off-by: default avatarAaron Tomlin <atomlin@redhat.com>
Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
parent 44c09535

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -10907,6 +10907,7 @@ F: drivers/tty/serial/kgdboc.c 
F:	include/linux/kdb.h

F:	include/linux/kgdb.h

F:	kernel/debug/

F:	kernel/module/kdb.c









KHADAS MCU MFD DRIVER









M:	Neil Armstrong <narmstrong@baylibre.com>
































include/linux/kdb.h



+1
−0






























Original line number
Diff line number
Diff line







@@ -222,5 +222,6 @@ enum {

















extern int kdbgetintenv(const char *, int *);









extern int kdb_set(int, const char **);









int kdb_lsmod(int argc, const char **argv);



















#endif	/* !_KDB_H */
























kernel/debug/kdb/kdb_io.c



+0
−1






























Original line number
Diff line number
Diff line







@@ -9,7 +9,6 @@







 * Copyright (c) 2009 Wind River Systems, Inc.  All Rights Reserved.









 */



















#include <linux/module.h>









#include <linux/types.h>









#include <linux/ctype.h>









#include <linux/kernel.h>
































kernel/debug/kdb/kdb_keyboard.c



+0
−1






























Original line number
Diff line number
Diff line







@@ -11,7 +11,6 @@







#include <linux/kdb.h>









#include <linux/keyboard.h>









#include <linux/ctype.h>









#include <linux/module.h>









#include <linux/io.h>



















/* Keyboard Controller Registers on normal PCs. */
































kernel/debug/kdb/kdb_main.c



+0
−49






























Original line number
Diff line number
Diff line







@@ -26,7 +26,6 @@







#include <linux/utsname.h>









#include <linux/vmalloc.h>









#include <linux/atomic.h>









#include <linux/module.h>









#include <linux/moduleparam.h>









#include <linux/mm.h>









#include <linux/init.h>








@@ -2004,54 +2003,6 @@ static int kdb_ef(int argc, const char **argv)







	return 0;









}



















#if defined(CONFIG_MODULES)









/*









 * kdb_lsmod - This function implements the 'lsmod' command.  Lists









 *	currently loaded kernel modules.









 *	Mostly taken from userland lsmod.









 */









static int kdb_lsmod(int argc, const char **argv)









{









	struct module *mod;



















	if (argc != 0)









		return KDB_ARGCOUNT;



















	kdb_printf("Module                  Size  modstruct     Used by\n");









	list_for_each_entry(mod, kdb_modules, list) {









		if (mod->state == MODULE_STATE_UNFORMED)









			continue;



















		kdb_printf("%-20s%8u  0x%px ", mod->name,









			   mod->core_layout.size, (void *)mod);









#ifdef CONFIG_MODULE_UNLOAD









		kdb_printf("%4d ", module_refcount(mod));









#endif









		if (mod->state == MODULE_STATE_GOING)









			kdb_printf(" (Unloading)");









		else if (mod->state == MODULE_STATE_COMING)









			kdb_printf(" (Loading)");









		else









			kdb_printf(" (Live)");









		kdb_printf(" 0x%px", mod->core_layout.base);



















#ifdef CONFIG_MODULE_UNLOAD









		{









			struct module_use *use;









			kdb_printf(" [ ");









			list_for_each_entry(use, &mod->source_list,









					    source_list)









				kdb_printf("%s ", use->target->name);









			kdb_printf("]\n");









		}









#endif









	}



















	return 0;









}



















#endif	/* CONFIG_MODULES */



















/*









 * kdb_env - This function implements the 'env' command.  Display the









 *	current environment variables.