2.6.16-rc3-git7 refresh

1 files changed, 11 insertions, 11 deletions

diff --git a/driver/module_sysfs_refcount.patch b/driver/module_sysfs_refcount.patch
index 2f8dd0a7a4278..46071e29acf27 100644
--- a/driver/module_sysfs_refcount.patch
+++ b/driver/module_sysfs_refcount.patch
@@ -22,7 +22,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- gregkh-2.6.orig/include/linux/module.h
 +++ gregkh-2.6/include/linux/module.h
-@@ -242,6 +242,7 @@ struct module
+@@ -245,6 +245,7 @@ struct module
  	/* Sysfs stuff. */
  	struct module_kobject mkobj;
  	struct module_param_attrs *param_attrs;
@@ -32,7 +32,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
 --- gregkh-2.6.orig/kernel/module.c
 +++ gregkh-2.6/kernel/module.c
-@@ -379,7 +379,6 @@ static inline void percpu_modcopy(void *
+@@ -429,7 +429,6 @@ static inline void percpu_modcopy(void *
  }
  #endif /* CONFIG_SMP */
  
@@ -40,7 +40,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #define MODINFO_ATTR(field)	\
  static void setup_modinfo_##field(struct module *mod, const char *s)  \
  {                                                                     \
-@@ -411,12 +410,7 @@ static struct module_attribute modinfo_#
+@@ -461,12 +460,7 @@ static struct module_attribute modinfo_#
  MODINFO_ATTR(version);
  MODINFO_ATTR(srcversion);
  
@@ -54,7 +54,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  /* Init the unload section of the module. */
  static void module_unload_init(struct module *mod)
  {
-@@ -731,6 +725,15 @@ static inline void module_unload_init(st
+@@ -781,6 +775,15 @@ static inline void module_unload_init(st
  }
  #endif /* CONFIG_MODULE_UNLOAD */
  
@@ -70,7 +70,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #ifdef CONFIG_OBSOLETE_MODPARM
  /* Bounds checking done below */
  static int obsparm_copy_string(const char *val, struct kernel_param *kp)
-@@ -1056,37 +1059,28 @@ static inline void remove_sect_attrs(str
+@@ -1106,37 +1109,28 @@ static inline void remove_sect_attrs(str
  }
  #endif /* CONFIG_KALLSYMS */
  
@@ -122,7 +122,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	}
  	return error;
  }
-@@ -1096,12 +1090,16 @@ static void module_remove_modinfo_attrs(
+@@ -1146,12 +1140,16 @@ static void module_remove_modinfo_attrs(
  	struct module_attribute *attr;
  	int i;
  
@@ -142,7 +142,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  static int mod_sysfs_setup(struct module *mod,
  			   struct kernel_param *kparam,
-@@ -1119,19 +1117,13 @@ static int mod_sysfs_setup(struct module
+@@ -1169,19 +1167,13 @@ static int mod_sysfs_setup(struct module
  	if (err)
  		goto out;
  
@@ -162,7 +162,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  	return 0;
  
-@@ -1143,10 +1135,7 @@ out:
+@@ -1193,10 +1185,7 @@ out:
  
  static void mod_kobject_remove(struct module *mod)
  {
@@ -173,7 +173,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	module_param_sysfs_remove(mod);
  
  	kobject_unregister(&mod->mkobj.kobj);
-@@ -1424,7 +1413,6 @@ static char *get_modinfo(Elf_Shdr *sechd
+@@ -1474,7 +1463,6 @@ static char *get_modinfo(Elf_Shdr *sechd
  	return NULL;
  }
  
@@ -181,7 +181,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  static void setup_modinfo(struct module *mod, Elf_Shdr *sechdrs,
  			  unsigned int infoindex)
  {
-@@ -1439,7 +1427,6 @@ static void setup_modinfo(struct module 
+@@ -1489,7 +1477,6 @@ static void setup_modinfo(struct module 
  						attr->attr.name));
  	}
  }
@@ -189,7 +189,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  #ifdef CONFIG_KALLSYMS
  int is_exported(const char *name, const struct module *mod)
-@@ -1755,10 +1742,8 @@ static struct module *load_module(void _
+@@ -1803,10 +1790,8 @@ static struct module *load_module(void _
  	if (strcmp(mod->name, "driverloader") == 0)
  		add_taint(TAINT_PROPRIETARY_MODULE);