Merge remote-tracking branch 'devicetree/devicetree/next'

[karo-tx-linux.git] / kernel / rcutiny.c

diff --git a/kernel/rcutiny.c b/kernel/rcutiny.c
index aa344111de3efdf67777bf6be400a5d2018b22c0..9ed6075dc562443b775cdec4efb56ff58b51bcef 100644 (file)
--- a/kernel/rcutiny.c
+++ b/kernel/rcutiny.c
@@ -264,7 +264,7 @@ void rcu_check_callbacks(int cpu, int user)
  */
 static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
 {
-       char *rn = NULL;
+       const char *rn = NULL;
        struct rcu_head *next, *list;
        unsigned long flags;
        RCU_TRACE(int cb_count = 0);