refresh of the hotplug-uevent replace from andrew.

add another kobject patch too.

2 files changed, 120 insertions, 2 deletions

diff --git a/driver/kill-hotplug-word-from-driver-core.patch b/driver/kill-hotplug-word-from-driver-core.patch
index 3b08464969bc8..6adb50045c1ee 100644
--- a/driver/kill-hotplug-word-from-driver-core.patch
+++ b/driver/kill-hotplug-word-from-driver-core.patch
@@ -11,6 +11,7 @@ Signed-off-by: Kay Sievers <kay.sievers@suse.de>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
  Documentation/powerpc/eeh-pci-error-recovery.txt |   31 ++++----
+ arch/powerpc/kernel/vio.c                        |    2 
  block/genhd.c                                    |   48 ++++++------
  drivers/acpi/container.c                         |    8 +-
  drivers/acpi/processor_core.c                    |    8 +-
@@ -20,11 +21,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  drivers/base/core.c                              |   42 +++++------
  drivers/base/cpu.c                               |    4 -
  drivers/base/firmware_class.c                    |   45 +++++-------
- drivers/base/memory.c                            |    8 +-
+ drivers/base/memory.c                            |   12 +--
  drivers/ieee1394/nodemgr.c                       |   20 ++---
  drivers/infiniband/core/sysfs.c                  |   16 ++--
  drivers/input/input.c                            |   14 +--
  drivers/input/serio/serio.c                      |   22 ++---
+ drivers/macintosh/macio_asic.c                   |    4 -
  drivers/mmc/mmc_sysfs.c                          |    4 -
  drivers/pci/hotplug.c                            |   44 +++++------
  drivers/pci/pci-driver.c                         |    6 -
@@ -48,7 +50,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  net/bluetooth/hci_sysfs.c                        |    4 -
  net/bridge/br_sysfs_if.c                         |    4 -
  net/core/net-sysfs.c                             |    8 +-
- 38 files changed, 368 insertions(+), 374 deletions(-)
+ 40 files changed, 373 insertions(+), 379 deletions(-)
 
 --- gregkh-2.6.orig/Documentation/powerpc/eeh-pci-error-recovery.txt
 +++ gregkh-2.6/Documentation/powerpc/eeh-pci-error-recovery.txt
@@ -818,6 +820,21 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	ret = kernel_thread(request_firmware_work_func, fw_work,
 --- gregkh-2.6.orig/drivers/base/memory.c
 +++ gregkh-2.6/drivers/base/memory.c
+@@ -30,12 +30,12 @@ static struct sysdev_class memory_sysdev
+ };
+ EXPORT_SYMBOL(memory_sysdev_class);
+ 
+-static char *memory_hotplug_name(struct kset *kset, struct kobject *kobj)
++static const char *memory_uevent_name(struct kset *kset, struct kobject *kobj)
+ {
+ 	return MEMORY_CLASS_NAME;
+ }
+ 
+-static int memory_hotplug(struct kset *kset, struct kobject *kobj, char **envp,
++static int memory_uevent(struct kset *kset, struct kobject *kobj, char **envp,
+ 			int num_envp, char *buffer, int buffer_size)
+ {
+ 	int retval = 0;
 @@ -43,9 +43,9 @@ static int memory_hotplug(struct kset *k
  	return retval;
  }
@@ -2030,3 +2047,33 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #endif
  };
  
+--- gregkh-2.6.orig/arch/powerpc/kernel/vio.c
++++ gregkh-2.6/arch/powerpc/kernel/vio.c
+@@ -293,6 +293,6 @@ static int vio_hotplug(struct device *de
+ 
+ struct bus_type vio_bus_type = {
+ 	.name = "vio",
+-	.hotplug = vio_hotplug,
++	.uevent = vio_hotplug,
+ 	.match = vio_bus_match,
+ };
+--- gregkh-2.6.orig/drivers/macintosh/macio_asic.c
++++ gregkh-2.6/drivers/macintosh/macio_asic.c
+@@ -128,7 +128,7 @@ static int macio_device_resume(struct de
+ 	return 0;
+ }
+ 
+-static int macio_hotplug (struct device *dev, char **envp, int num_envp,
++static int macio_uevent(struct device *dev, char **envp, int num_envp,
+                           char *buffer, int buffer_size)
+ {
+ 	struct macio_dev * macio_dev;
+@@ -203,7 +203,7 @@ extern struct device_attribute macio_dev
+ struct bus_type macio_bus_type = {
+        .name	= "macio",
+        .match	= macio_bus_match,
+-       .hotplug = macio_hotplug,
++       .uevent = macio_uevent,
+        .suspend	= macio_device_suspend,
+        .resume	= macio_device_resume,
+        .dev_attrs = macio_dev_attrs,
diff --git a/driver/kobject_uevent-config_net-n-fix.patch b/driver/kobject_uevent-config_net-n-fix.patch
new file mode 100644
index 0000000000000..f0e9f6d4b3096
--- /dev/null
+++ b/driver/kobject_uevent-config_net-n-fix.patch
@@ -0,0 +1,71 @@
+From akpm@osdl.org Tue Nov 22 23:40:53 2005
+Message-Id: <200511230736.jAN7aLdF025347@shell0.pdx.osdl.net>
+From: Andrew Morton <akpm@osdl.org>
+Subject: kobject_uevent CONFIG_NET=n fix
+To: akpm@osdl.org, greg@kroah.com
+From: akpm@osdl.org
+Date: Tue, 22 Nov 2005 23:36:13 -0800
+
+
+lib/lib.a(kobject_uevent.o)(.text+0x25f): In function `kobject_uevent':
+: undefined reference to `__alloc_skb'
+lib/lib.a(kobject_uevent.o)(.text+0x2a1): In function `kobject_uevent':
+: undefined reference to `skb_over_panic'
+lib/lib.a(kobject_uevent.o)(.text+0x31d): In function `kobject_uevent':
+: undefined reference to `skb_over_panic'
+lib/lib.a(kobject_uevent.o)(.text+0x356): In function `kobject_uevent':
+: undefined reference to `netlink_broadcast'
+lib/lib.a(kobject_uevent.o)(.init.text+0x9): In function `kobject_uevent_init':
+: undefined reference to `netlink_kernel_create'
+make: *** [.tmp_vmlinux1] Error 1
+
+Netlink is unconditionally enabled if CONFIG_NET, so that's OK.
+
+kobject_uevent.o is compiled even if !CONFIG_HOTPLUG, which is lazy.
+
+Let's compound the sin.
+
+Signed-off-by: Andrew Morton <akpm@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+---
+ include/linux/kobject.h |    2 +-
+ kernel/ksysfs.c         |    3 +++
+ lib/kobject_uevent.c    |    4 +---
+ 3 files changed, 5 insertions(+), 4 deletions(-)
+
+--- gregkh-2.6.orig/lib/kobject_uevent.c
++++ gregkh-2.6/lib/kobject_uevent.c
+@@ -25,9 +25,7 @@
+ #define BUFFER_SIZE	1024	/* buffer for the variables */
+ #define NUM_ENVP	32	/* number of env pointers */
+ 
+-#if defined(CONFIG_HOTPLUG)
+-char uevent_helper[UEVENT_HELPER_PATH_LEN] = "/sbin/hotplug";
+-u64 uevent_seqnum;
++#if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET)
+ static DEFINE_SPINLOCK(sequence_lock);
+ static struct sock *uevent_sock;
+ 
+--- gregkh-2.6.orig/include/linux/kobject.h
++++ gregkh-2.6/include/linux/kobject.h
+@@ -253,7 +253,7 @@ struct subsys_attribute {
+ extern int subsys_create_file(struct subsystem * , struct subsys_attribute *);
+ extern void subsys_remove_file(struct subsystem * , struct subsys_attribute *);
+ 
+-#ifdef CONFIG_HOTPLUG
++#if defined(CONFIG_HOTPLUG) & defined(CONFIG_NET)
+ void kobject_uevent(struct kobject *kobj, enum kobject_action action);
+ 
+ int add_uevent_var(char **envp, int num_envp, int *cur_index,
+--- gregkh-2.6.orig/kernel/ksysfs.c
++++ gregkh-2.6/kernel/ksysfs.c
+@@ -15,6 +15,9 @@
+ #include <linux/module.h>
+ #include <linux/init.h>
+ 
++u64 uevent_seqnum;
++char uevent_helper[UEVENT_HELPER_PATH_LEN] = "/sbin/hotplug";
++
+ #define KERNEL_ATTR_RO(_name) \
+ static struct subsys_attribute _name##_attr = __ATTR_RO(_name)
+