merge linus into release branch

Conflicts:

	drivers/acpi/acpi_memhotplug.c

7 files changed, 165 insertions, 11 deletions

diff --git a/lib/Kconfig b/lib/Kconfig
index 3de93357f5ab..f6299342b882 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -86,4 +86,10 @@ config TEXTSEARCH_BM
 config TEXTSEARCH_FSM
         tristate
 
+#
+# plist support is select#ed if needed
+#
+config PLIST
+        boolean
+
 endmenu
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 8bab0102ac73..e4fcbd12cf6e 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -23,6 +23,22 @@ config MAGIC_SYSRQ
           keys are documented in <file:Documentation/sysrq.txt>. Don't say Y
           unless you really know what this hack does.
 
+config UNUSED_SYMBOLS
+        bool "Enable unused/obsolete exported symbols"
+        default y if X86
+        help
+          Unused but exported symbols make the kernel needlessly bigger.  For
+          that reason most of these unused exports will soon be removed.  This
+          option is provided temporarily to provide a transition period in case
+          some external kernel module needs one of these symbols anyway. If you
+          encounter such a case in your module, consider if you are actually
+          using the right API.  (rationale: since nobody in the kernel is using
+          this in a module, there is a pretty good chance it's actually the
+          wrong interface to use).  If you really need the symbol, please send a
+          mail to the linux kernel mailing list mentioning the symbol and why
+          you really need it, and what the merge plan to the mainline kernel for
+          your module is.
+
 config DEBUG_KERNEL
         bool "Kernel debugging"
         help
@@ -107,6 +123,24 @@ config DEBUG_MUTEXES
          This allows mutex semantics violations and mutex related deadlocks
          (lockups) to be detected and reported automatically.
 
+config DEBUG_RT_MUTEXES
+        bool "RT Mutex debugging, deadlock detection"
+        depends on DEBUG_KERNEL && RT_MUTEXES
+        help
+         This allows rt mutex semantics violations and rt mutex related
+         deadlocks (lockups) to be detected and reported automatically.
+
+config DEBUG_PI_LIST
+        bool
+        default y
+        depends on DEBUG_RT_MUTEXES
+
+config RT_MUTEX_TESTER
+        bool "Built-in scriptable tester for rt-mutexes"
+        depends on DEBUG_KERNEL && RT_MUTEXES
+        help
+          This option enables a rt-mutex tester.
+
 config DEBUG_SPINLOCK
         bool "Spinlock debugging"
         depends on DEBUG_KERNEL
diff --git a/lib/Makefile b/lib/Makefile
index 79358ad1f113..10c13c9d7824 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -25,6 +25,7 @@ lib-$(CONFIG_SEMAPHORE_SLEEPERS) += semaphore-sleepers.o
 lib-$(CONFIG_GENERIC_FIND_NEXT_BIT) += find_next_bit.o
 lib-$(CONFIG_GENERIC_HWEIGHT) += hweight.o
 obj-$(CONFIG_LOCK_KERNEL) += kernel_lock.o
+obj-$(CONFIG_PLIST) += plist.o
 obj-$(CONFIG_DEBUG_PREEMPT) += smp_processor_id.o
 
 ifneq ($(CONFIG_HAVE_DEC_LOCK),y)
diff --git a/lib/plist.c b/lib/plist.c
new file mode 100644
index 000000000000..3074a02272f3
--- /dev/null
+++ b/lib/plist.c
@@ -0,0 +1,118 @@
+/*
+ * lib/plist.c
+ *
+ * Descending-priority-sorted double-linked list
+ *
+ * (C) 2002-2003 Intel Corp
+ * Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>.
+ *
+ * 2001-2005 (c) MontaVista Software, Inc.
+ * Daniel Walker <dwalker@mvista.com>
+ *
+ * (C) 2005 Thomas Gleixner <tglx@linutronix.de>
+ *
+ * Simplifications of the original code by
+ * Oleg Nesterov <oleg@tv-sign.ru>
+ *
+ * Licensed under the FSF's GNU Public License v2 or later.
+ *
+ * Based on simple lists (include/linux/list.h).
+ *
+ * This file contains the add / del functions which are considered to
+ * be too large to inline. See include/linux/plist.h for further
+ * information.
+ */
+
+#include <linux/plist.h>
+#include <linux/spinlock.h>
+
+#ifdef CONFIG_DEBUG_PI_LIST
+
+static void plist_check_prev_next(struct list_head *t, struct list_head *p,
+                                  struct list_head *n)
+{
+        if (n->prev != p || p->next != n) {
+                printk("top: %p, n: %p, p: %p\n", t, t->next, t->prev);
+                printk("prev: %p, n: %p, p: %p\n", p, p->next, p->prev);
+                printk("next: %p, n: %p, p: %p\n", n, n->next, n->prev);
+                WARN_ON(1);
+        }
+}
+
+static void plist_check_list(struct list_head *top)
+{
+        struct list_head *prev = top, *next = top->next;
+
+        plist_check_prev_next(top, prev, next);
+        while (next != top) {
+                prev = next;
+                next = prev->next;
+                plist_check_prev_next(top, prev, next);
+        }
+}
+
+static void plist_check_head(struct plist_head *head)
+{
+        WARN_ON(!head->lock);
+        if (head->lock)
+                WARN_ON_SMP(!spin_is_locked(head->lock));
+        plist_check_list(&head->prio_list);
+        plist_check_list(&head->node_list);
+}
+
+#else
+# define plist_check_head(h)    do { } while (0)
+#endif
+
+/**
+ * plist_add - add @node to @head
+ *
+ * @node:       &struct plist_node pointer
+ * @head:       &struct plist_head pointer
+ */
+void plist_add(struct plist_node *node, struct plist_head *head)
+{
+        struct plist_node *iter;
+
+        plist_check_head(head);
+        WARN_ON(!plist_node_empty(node));
+
+        list_for_each_entry(iter, &head->prio_list, plist.prio_list) {
+                if (node->prio < iter->prio)
+                        goto lt_prio;
+                else if (node->prio == iter->prio) {
+                        iter = list_entry(iter->plist.prio_list.next,
+                                        struct plist_node, plist.prio_list);
+                        goto eq_prio;
+                }
+        }
+
+lt_prio:
+        list_add_tail(&node->plist.prio_list, &iter->plist.prio_list);
+eq_prio:
+        list_add_tail(&node->plist.node_list, &iter->plist.node_list);
+
+        plist_check_head(head);
+}
+
+/**
+ * plist_del - Remove a @node from plist.
+ *
+ * @node:       &struct plist_node pointer - entry to be removed
+ * @head:       &struct plist_head pointer - list head
+ */
+void plist_del(struct plist_node *node, struct plist_head *head)
+{
+        plist_check_head(head);
+
+        if (!list_empty(&node->plist.prio_list)) {
+                struct plist_node *next = plist_first(&node->plist);
+
+                list_move_tail(&next->plist.prio_list, &node->plist.prio_list);
+                list_del_init(&node->plist.prio_list);
+        }
+
+        list_del_init(&node->plist.node_list);
+
+        plist_check_head(head);
+}
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 797428afd111..bed7229378f2 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -489,7 +489,7 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args)
                 if (str < end)
                         *str = '\0';
                 else
-                        *end = '\0';
+                        end[-1] = '\0';
         }
         /* the trailing null byte doesn't count towards the total */
         return str-buf;
diff --git a/lib/zlib_inflate/inffast.c b/lib/zlib_inflate/inffast.c
index 02a16eacb72d..d84560c076d8 100644
--- a/lib/zlib_inflate/inffast.c
+++ b/lib/zlib_inflate/inffast.c
@@ -63,10 +63,10 @@
       bytes, which is the maximum length that can be coded.  inflate_fast()
       requires strm->avail_out >= 258 for each loop to avoid checking for
       output space.
+
+    - @start:   inflate()'s starting value for strm->avail_out
  */
-void inflate_fast(strm, start)
-z_streamp strm;
-unsigned start;         /* inflate()'s starting value for strm->avail_out */
+void inflate_fast(z_streamp strm, unsigned start)
 {
     struct inflate_state *state;
     unsigned char *in;      /* local strm->next_in */
diff --git a/lib/zlib_inflate/inftrees.c b/lib/zlib_inflate/inftrees.c
index da665fbb16aa..3fe6ce5b53e5 100644
--- a/lib/zlib_inflate/inftrees.c
+++ b/lib/zlib_inflate/inftrees.c
@@ -20,13 +20,8 @@
    table index bits.  It will differ if the request is greater than the
    longest code or if it is less than the shortest code.
  */
-int zlib_inflate_table(type, lens, codes, table, bits, work)
-codetype type;
-unsigned short *lens;
-unsigned codes;
-code **table;
-unsigned *bits;
-unsigned short *work;
+int zlib_inflate_table(codetype type, unsigned short *lens, unsigned codes,
+                        code **table, unsigned *bits, unsigned short *work)
 {
     unsigned len;               /* a code's length in bits */
     unsigned sym;               /* index of code symbols */