[Ltp-cvs] ltp/testcases/kernel/module/delete_module dummy_del_mod.c,1.3,1.4 dummy_del_mod_dep.c,1.3,1.4

[Martin R. <mr...@us...>]

Update of /cvsroot/ltp/ltp/testcases/kernel/module/delete_module
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19103

Modified Files:
	dummy_del_mod.c dummy_del_mod_dep.c 
Log Message:
Changes requested from the security team for fix PPC64 error


Index: dummy_del_mod.c
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/module/delete_module/dummy_del_mod.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** dummy_del_mod.c	16 Sep 2004 16:10:50 -0000	1.3
--- dummy_del_mod.c	22 Sep 2004 19:52:13 -0000	1.4
***************
*** 30,58 ****
  #include <linux/config.h>
  #include <linux/module.h>
  #include <linux/kernel.h>
  
  
! void dummy_func_test(void);
  
! /* Initialization routine of module */
! int
! init_module (void)
  {
  	return 0;
  }
  
! /* Cleanup routine of module */
! void
! cleanup_module (void)
! {
! 	return;
  }
  
! /* Dummy function called by dependent module */
! void
! dummy_func_test(void)
! {
! 	return;
  }
  
  EXPORT_SYMBOL(dummy_func_test);
--- 30,60 ----
  #include <linux/config.h>
  #include <linux/module.h>
+ #include <linux/init.h>
+ #include <linux/proc_fs.h>
  #include <linux/kernel.h>
  
  
! static int dummy_func_test(void);
  
! /* Dummy function called by dependent module */
! 
! static int dummy_func_test()
  {
  	return 0;
  }
  
! static int __init dummy_init(void) {
!         struct proc_dir_entry *proc_dummy;
! 
!         proc_dummy = proc_mkdir("dummy", 0);
!         return 0;
  }
  
! static void __exit dummy_exit(void) {
! 
!         remove_proc_entry("dummy", 0);
  }
  
+ module_init(dummy_init);
+ module_exit(dummy_exit);
  EXPORT_SYMBOL(dummy_func_test);

Index: dummy_del_mod_dep.c
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/module/delete_module/dummy_del_mod_dep.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** dummy_del_mod_dep.c	16 Sep 2004 16:10:50 -0000	1.3
--- dummy_del_mod_dep.c	22 Sep 2004 19:52:13 -0000	1.4
***************
*** 31,54 ****
  #include <linux/module.h>
  #include <linux/config.h>
  #include <linux/kernel.h>
  
! extern void dummy_func_test(void);
  
! /* Initialization routine of module */
! int
! init_module (void)
! {
! 	/*
! 	 * Call function of other module, does nothing, used to create
! 	 * dependency with other module
! 	 */
! 	dummy_func_test();
! 	return 0;
  }
  
! /* Cleanup routine of module */
! void
! cleanup_module (void)
! {
! 	return;
  }
--- 31,52 ----
  #include <linux/module.h>
  #include <linux/config.h>
+ #include <linux/init.h>
+ #include <linux/proc_fs.h>
  #include <linux/kernel.h>
  
! extern int dummy_func_test(void);
  
! static int __init dummy_init(void) {
!         struct proc_dir_entry *proc_dummy;
! 
!         proc_dummy = proc_mkdir("dummy_dep", 0);
!         dummy_func_test();
!         return 0;
  }
  
! static void __exit dummy_exit(void) {
!         remove_proc_entry("dummy_dep", 0);
  }
+ 
+ module_init(dummy_init);
+ module_exit(dummy_exit);