Merge ../linux-2.6

3 files changed, 15 insertions, 11 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index d57fd9181b18..ccb0c1fdf1b5 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -101,7 +101,7 @@ config DEBUG_PREEMPT
 
 config DEBUG_MUTEXES
         bool "Mutex debugging, deadlock detection"
-        default y
+        default n
         depends on DEBUG_KERNEL
         help
          This allows mutex semantics violations and mutex related deadlocks
@@ -189,7 +189,7 @@ config FRAME_POINTER
 config UNWIND_INFO
         bool "Compile the kernel with frame unwind information"
         depends on !IA64
-        depends on !MODULES || !(MIPS || PARISC || PPC || SUPERH || SPARC64 || V850)
+        depends on !MODULES || !(MIPS || PARISC || PPC || SUPERH || V850)
         help
           If you say Y here the resulting kernel image will be slightly larger
           but not slower, and it will give very useful debugging information.
diff --git a/lib/kobject.c b/lib/kobject.c
index 25204a41a9b0..687ab418d292 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -128,6 +128,7 @@ void kobject_init(struct kobject * kobj)
 {
         kref_init(&kobj->kref);
         INIT_LIST_HEAD(&kobj->entry);
+        init_waitqueue_head(&kobj->poll);
         kobj->kset = kset_get(kobj->kset);
 }
 
@@ -197,14 +198,14 @@ int kobject_add(struct kobject * kobj)
 
                 /* be noisy on error issues */
                 if (error == -EEXIST)
-                        printk("kobject_add failed for %s with -EEXIST, "
+                        pr_debug("kobject_add failed for %s with -EEXIST, "
                                "don't try to register things with the "
                                "same name in the same directory.\n",
                                kobject_name(kobj));
                 else
-                        printk("kobject_add failed for %s (%d)\n",
+                        pr_debug("kobject_add failed for %s (%d)\n",
                                kobject_name(kobj), error);
-                dump_stack();
+                /* dump_stack(); */
         }
 
         return error;
@@ -421,7 +422,6 @@ struct kobject *kobject_add_dir(struct kobject *parent, const char *name)
 
         return k;
 }
-EXPORT_SYMBOL_GPL(kobject_add_dir);
 
 /**
  *      kset_init - initialize a kset for use
@@ -568,7 +568,7 @@ int subsys_create_file(struct subsystem * s, struct subsys_attribute * a)
  *      @s:     subsystem.
  *      @a:     attribute desciptor.
  */
-
+#if 0
 void subsys_remove_file(struct subsystem * s, struct subsys_attribute * a)
 {
         if (subsys_get(s)) {
@@ -576,6 +576,7 @@ void subsys_remove_file(struct subsystem * s, struct subsys_attribute * a)
                 subsys_put(s);
         }
 }
+#endif  /*  0  */
 
 EXPORT_SYMBOL(kobject_init);
 EXPORT_SYMBOL(kobject_register);
@@ -587,10 +588,7 @@ EXPORT_SYMBOL(kobject_del);
 
 EXPORT_SYMBOL(kset_register);
 EXPORT_SYMBOL(kset_unregister);
-EXPORT_SYMBOL(kset_find_obj);
 
-EXPORT_SYMBOL(subsystem_init);
 EXPORT_SYMBOL(subsystem_register);
 EXPORT_SYMBOL(subsystem_unregister);
 EXPORT_SYMBOL(subsys_create_file);
-EXPORT_SYMBOL(subsys_remove_file);
diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index 982226daf939..7f20e7b857cb 100644
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -25,11 +25,13 @@
 #define BUFFER_SIZE     2048    /* buffer for the variables */
 #define NUM_ENVP        32      /* number of env pointers */
 
-#if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET)
+#if defined(CONFIG_HOTPLUG)
 u64 uevent_seqnum;
 char uevent_helper[UEVENT_HELPER_PATH_LEN] = "/sbin/hotplug";
 static DEFINE_SPINLOCK(sequence_lock);
+#if defined(CONFIG_NET)
 static struct sock *uevent_sock;
+#endif
 
 static char *action_to_string(enum kobject_action action)
 {
@@ -155,6 +157,7 @@ void kobject_uevent(struct kobject *kobj, enum kobject_action action)
         spin_unlock(&sequence_lock);
         sprintf(seq_buff, "SEQNUM=%llu", (unsigned long long)seq);
 
+#if defined(CONFIG_NET)
         /* send netlink message */
         if (uevent_sock) {
                 struct sk_buff *skb;
@@ -179,6 +182,7 @@ void kobject_uevent(struct kobject *kobj, enum kobject_action action)
                         netlink_broadcast(uevent_sock, skb, 0, 1, GFP_KERNEL);
                 }
         }
+#endif
 
         /* call uevent_helper, usually only enabled during early boot */
         if (uevent_helper[0]) {
@@ -249,6 +253,7 @@ int add_uevent_var(char **envp, int num_envp, int *cur_index,
 }
 EXPORT_SYMBOL_GPL(add_uevent_var);
 
+#if defined(CONFIG_NET)
 static int __init kobject_uevent_init(void)
 {
         uevent_sock = netlink_kernel_create(NETLINK_KOBJECT_UEVENT, 1, NULL,
@@ -264,5 +269,6 @@ static int __init kobject_uevent_init(void)
 }
 
 postcore_initcall(kobject_uevent_init);
+#endif
 
 #endif /* CONFIG_HOTPLUG */