4 files changed, 34 insertions, 37 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 2e75478e9c69..29044f500269 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -512,6 +512,13 @@ config DEBUG_VIRTUAL
 
           If unsure, say N.
 
+config DEBUG_NOMMU_REGIONS
+        bool "Debug the global anon/private NOMMU mapping region tree"
+        depends on DEBUG_KERNEL && !MMU
+        help
+          This option causes the global tree of anonymous and private mapping
+          regions to be regularly checked for invalid topology.
+
 config DEBUG_WRITECOUNT
         bool "Debug filesystem writers count"
         depends on DEBUG_KERNEL
@@ -563,17 +570,26 @@ config DEBUG_NOTIFIERS
           This is a relatively cheap check but if you care about maximum
           performance, say N.
 
+#
+# Select this config option from the architecture Kconfig, if it
+# it is preferred to always offer frame pointers as a config
+# option on the architecture (regardless of KERNEL_DEBUG):
+#
+config ARCH_WANT_FRAME_POINTERS
+        bool
+        help
+
 config FRAME_POINTER
         bool "Compile the kernel with frame pointers"
         depends on DEBUG_KERNEL && \
-                (X86 || CRIS || M68K || M68KNOMMU || FRV || UML || S390 || \
-                 AVR32 || SUPERH || BLACKFIN || MN10300)
-        default y if DEBUG_INFO && UML
+                (CRIS || M68K || M68KNOMMU || FRV || UML || S390 || \
+                 AVR32 || SUPERH || BLACKFIN || MN10300) || \
+                ARCH_WANT_FRAME_POINTERS
+        default y if (DEBUG_INFO && UML) || ARCH_WANT_FRAME_POINTERS
         help
-          If you say Y here the resulting kernel image will be slightly larger
-          and slower, but it might give very useful debugging information on
-          some architectures or if you use external debuggers.
-          If you don't debug the kernel, you can say N.
+          If you say Y here the resulting kernel image will be slightly
+          larger and slower, but it gives very useful debugging information
+          in case of kernel bugs. (precise oopses/stacktraces/warnings)
 
 config BOOT_PRINTK_DELAY
         bool "Delay each boot printk message by N milliseconds"
@@ -626,19 +642,6 @@ config RCU_TORTURE_TEST_RUNNABLE
 
 config RCU_CPU_STALL_DETECTOR
         bool "Check for stalled CPUs delaying RCU grace periods"
-        depends on CLASSIC_RCU
-        default n
-        help
-          This option causes RCU to printk information on which
-          CPUs are delaying the current grace period, but only when
-          the grace period extends for excessive time periods.
-
-          Say Y if you want RCU to perform such checks.
-
-          Say N if you are unsure.
-
-config RCU_CPU_STALL_DETECTOR
-        bool "Check for stalled CPUs delaying RCU grace periods"
         depends on CLASSIC_RCU || TREE_RCU
         default n
         help
diff --git a/lib/idr.c b/lib/idr.c
index 1c4f9281f412..c11c5765cdef 100644
--- a/lib/idr.c
+++ b/lib/idr.c
@@ -121,7 +121,7 @@ int idr_pre_get(struct idr *idp, gfp_t gfp_mask)
 {
         while (idp->id_free_cnt < IDR_FREE_MAX) {
                 struct idr_layer *new;
-                new = kmem_cache_alloc(idr_layer_cache, gfp_mask);
+                new = kmem_cache_zalloc(idr_layer_cache, gfp_mask);
                 if (new == NULL)
                         return (0);
                 move_to_free_list(idp, new);
@@ -292,7 +292,7 @@ static int idr_get_new_above_int(struct idr *idp, void *ptr, int starting_id)
  * and go back to the idr_pre_get() call.  If the idr is full, it will
  * return -ENOSPC.
  *
- * @id returns a value in the range 0 ... 0x7fffffff
+ * @id returns a value in the range @starting_id ... 0x7fffffff
  */
 int idr_get_new_above(struct idr *idp, void *ptr, int starting_id, int *id)
 {
@@ -623,16 +623,10 @@ void *idr_replace(struct idr *idp, void *ptr, int id)
 }
 EXPORT_SYMBOL(idr_replace);
 
-static void idr_cache_ctor(void *idr_layer)
-{
-        memset(idr_layer, 0, sizeof(struct idr_layer));
-}
-
 void __init idr_init_cache(void)
 {
         idr_layer_cache = kmem_cache_create("idr_layer_cache",
-                                sizeof(struct idr_layer), 0, SLAB_PANIC,
-                                idr_cache_ctor);
+                                sizeof(struct idr_layer), 0, SLAB_PANIC, NULL);
 }
 
 /**
@@ -723,7 +717,7 @@ EXPORT_SYMBOL(ida_pre_get);
  * and go back to the ida_pre_get() call.  If the ida is full, it will
  * return -ENOSPC.
  *
- * @p_id returns a value in the range 0 ... 0x7fffffff.
+ * @p_id returns a value in the range @starting_id ... 0x7fffffff.
  */
 int ida_get_new_above(struct ida *ida, int starting_id, int *p_id)
 {
diff --git a/lib/rbtree.c b/lib/rbtree.c
index 48499c2d88cc..9956b99649f0 100644
--- a/lib/rbtree.c
+++ b/lib/rbtree.c
@@ -292,7 +292,7 @@ EXPORT_SYMBOL(rb_erase);
 /*
  * This function returns the first node (in sort order) of the tree.
  */
-struct rb_node *rb_first(struct rb_root *root)
+struct rb_node *rb_first(const struct rb_root *root)
 {
         struct rb_node  *n;
 
@@ -305,7 +305,7 @@ struct rb_node *rb_first(struct rb_root *root)
 }
 EXPORT_SYMBOL(rb_first);
 
-struct rb_node *rb_last(struct rb_root *root)
+struct rb_node *rb_last(const struct rb_root *root)
 {
         struct rb_node  *n;
 
@@ -318,7 +318,7 @@ struct rb_node *rb_last(struct rb_root *root)
 }
 EXPORT_SYMBOL(rb_last);
 
-struct rb_node *rb_next(struct rb_node *node)
+struct rb_node *rb_next(const struct rb_node *node)
 {
         struct rb_node *parent;
 
@@ -331,7 +331,7 @@ struct rb_node *rb_next(struct rb_node *node)
                 node = node->rb_right; 
                 while (node->rb_left)
                         node=node->rb_left;
-                return node;
+                return (struct rb_node *)node;
         }
 
         /* No right-hand children.  Everything down and left is
@@ -347,7 +347,7 @@ struct rb_node *rb_next(struct rb_node *node)
 }
 EXPORT_SYMBOL(rb_next);
 
-struct rb_node *rb_prev(struct rb_node *node)
+struct rb_node *rb_prev(const struct rb_node *node)
 {
         struct rb_node *parent;
 
@@ -360,7 +360,7 @@ struct rb_node *rb_prev(struct rb_node *node)
                 node = node->rb_left; 
                 while (node->rb_right)
                         node=node->rb_right;
-                return node;
+                return (struct rb_node *)node;
         }
 
         /* No left-hand children. Go up till we find an ancestor which
diff --git a/lib/smp_processor_id.c b/lib/smp_processor_id.c
index 0f8fc22ed103..4689cb073da4 100644
--- a/lib/smp_processor_id.c
+++ b/lib/smp_processor_id.c
@@ -22,7 +22,7 @@ notrace unsigned int debug_smp_processor_id(void)
          * Kernel threads bound to a single CPU can safely use
          * smp_processor_id():
          */
-        if (cpus_equal(current->cpus_allowed, cpumask_of_cpu(this_cpu)))
+        if (cpumask_equal(&current->cpus_allowed, cpumask_of(this_cpu)))
                 goto out;
 
         /*