Merge branch 'master' into gfs2

4 files changed, 41 insertions, 17 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 554ee688a9f8..b0f5ca72599f 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -8,6 +8,13 @@ config PRINTK_TIME
           operations.  This is useful for identifying long delays
           in kernel startup.
 
+config ENABLE_MUST_CHECK
+        bool "Enable __must_check logic"
+        default y
+        help
+          Enable the __must_check logic in the kernel build.  Disable this to
+          suppress the "warning: ignoring return value of 'foo', declared with
+          attribute warn_unused_result" messages.
 
 config MAGIC_SYSRQ
         bool "Magic SysRq key"
@@ -218,7 +225,7 @@ config LOCKDEP
         bool
         depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
         select STACKTRACE
-        select FRAME_POINTER
+        select FRAME_POINTER if !X86
         select KALLSYMS
         select KALLSYMS_ALL
 
@@ -277,7 +284,7 @@ config DEBUG_HIGHMEM
 config DEBUG_BUGVERBOSE
         bool "Verbose BUG() reporting (adds 70K)" if DEBUG_KERNEL && EMBEDDED
         depends on BUG
-        depends on ARM || ARM26 || M32R || M68K || SPARC32 || SPARC64 || X86_32 || FRV
+        depends on ARM || ARM26 || AVR32 || M32R || M68K || SPARC32 || SPARC64 || X86_32 || FRV || SUPERH
         default !EMBEDDED
         help
           Say Y here to make BUG() panics output the file name and line number
@@ -315,7 +322,7 @@ config DEBUG_VM
 
 config FRAME_POINTER
         bool "Compile the kernel with frame pointers"
-        depends on DEBUG_KERNEL && (X86 || CRIS || M68K || M68KNOMMU || FRV || UML || S390)
+        depends on DEBUG_KERNEL && (X86 || CRIS || M68K || M68KNOMMU || FRV || UML || S390 || AVR32 || SUPERH)
         default y if DEBUG_INFO && UML
         help
           If you say Y here the resulting kernel image will be slightly larger
diff --git a/lib/hweight.c b/lib/hweight.c
index 438257671708..360556a7803d 100644
--- a/lib/hweight.c
+++ b/lib/hweight.c
@@ -1,5 +1,6 @@
 #include <linux/module.h>
 #include <asm/types.h>
+#include <asm/bitops.h>
 
 /**
  * hweightN - returns the hamming weight of a N-bit word
@@ -40,14 +41,19 @@ unsigned long hweight64(__u64 w)
 #if BITS_PER_LONG == 32
         return hweight32((unsigned int)(w >> 32)) + hweight32((unsigned int)w);
 #elif BITS_PER_LONG == 64
+#ifdef ARCH_HAS_FAST_MULTIPLIER
+        w -= (w >> 1) & 0x5555555555555555ul;
+        w =  (w & 0x3333333333333333ul) + ((w >> 2) & 0x3333333333333333ul);
+        w =  (w + (w >> 4)) & 0x0f0f0f0f0f0f0f0ful;
+        return (w * 0x0101010101010101ul) >> 56;
+#else
         __u64 res = w - ((w >> 1) & 0x5555555555555555ul);
         res = (res & 0x3333333333333333ul) + ((res >> 2) & 0x3333333333333333ul);
         res = (res + (res >> 4)) & 0x0F0F0F0F0F0F0F0Ful;
         res = res + (res >> 8);
         res = res + (res >> 16);
         return (res + (res >> 32)) & 0x00000000000000FFul;
-#else
-#error BITS_PER_LONG not defined
+#endif
 #endif
 }
 EXPORT_SYMBOL(hweight64);
diff --git a/lib/klist.c b/lib/klist.c
index 9c94f0b163a1..120bd175aa78 100644
--- a/lib/klist.c
+++ b/lib/klist.c
@@ -123,12 +123,10 @@ EXPORT_SYMBOL_GPL(klist_add_tail);
 static void klist_release(struct kref * kref)
 {
         struct klist_node * n = container_of(kref, struct klist_node, n_ref);
-        void (*put)(struct klist_node *) = n->n_klist->put;
+
         list_del(&n->n_node);
         complete(&n->n_removed);
         n->n_klist = NULL;
-        if (put)
-                put(n);
 }
 
 static int klist_dec_and_del(struct klist_node * n)
@@ -145,10 +143,14 @@ static int klist_dec_and_del(struct klist_node * n)
 void klist_del(struct klist_node * n)
 {
         struct klist * k = n->n_klist;
+        void (*put)(struct klist_node *) = k->put;
 
         spin_lock(&k->k_lock);
-        klist_dec_and_del(n);
+        if (!klist_dec_and_del(n))
+                put = NULL;
         spin_unlock(&k->k_lock);
+        if (put)
+                put(n);
 }
 
 EXPORT_SYMBOL_GPL(klist_del);
@@ -161,10 +163,7 @@ EXPORT_SYMBOL_GPL(klist_del);
 
 void klist_remove(struct klist_node * n)
 {
-        struct klist * k = n->n_klist;
-        spin_lock(&k->k_lock);
-        klist_dec_and_del(n);
-        spin_unlock(&k->k_lock);
+        klist_del(n);
         wait_for_completion(&n->n_removed);
 }
 
@@ -260,12 +259,15 @@ static struct klist_node * to_klist_node(struct list_head * n)
 struct klist_node * klist_next(struct klist_iter * i)
 {
         struct list_head * next;
+        struct klist_node * lnode = i->i_cur;
         struct klist_node * knode = NULL;
+        void (*put)(struct klist_node *) = i->i_klist->put;
 
         spin_lock(&i->i_klist->k_lock);
-        if (i->i_cur) {
-                next = i->i_cur->n_node.next;
-                klist_dec_and_del(i->i_cur);
+        if (lnode) {
+                next = lnode->n_node.next;
+                if (!klist_dec_and_del(lnode))
+                        put = NULL;
         } else
                 next = i->i_head->next;
 
@@ -275,6 +277,8 @@ struct klist_node * klist_next(struct klist_iter * i)
         }
         i->i_cur = knode;
         spin_unlock(&i->i_klist->k_lock);
+        if (put && lnode)
+                put(lnode);
         return knode;
 }
 
diff --git a/lib/kobject.c b/lib/kobject.c
index 8e7c71993487..1699eb9161f3 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -407,6 +407,7 @@ static struct kobj_type dir_ktype = {
 struct kobject *kobject_add_dir(struct kobject *parent, const char *name)
 {
         struct kobject *k;
+        int ret;
 
         if (!parent)
                 return NULL;
@@ -418,7 +419,13 @@ struct kobject *kobject_add_dir(struct kobject *parent, const char *name)
         k->parent = parent;
         k->ktype = &dir_ktype;
         kobject_set_name(k, name);
-        kobject_register(k);
+        ret = kobject_register(k);
+        if (ret < 0) {
+                printk(KERN_WARNING "kobject_add_dir: "
+                        "kobject_register error: %d\n", ret);
+                kobject_del(k);
+                return NULL;
+        }
 
         return k;
 }