rt-patches/0232-lockdep-selftest-fix-warnings-due-to-missing-PREEMPT.patch

   1 From 70f9bdb3d0884a99e158158f5722580518b3ea7e Mon Sep 17 00:00:00 2001
   2 From: Josh Cartwright <josh.cartwright@ni.com>
   3 Date: Wed, 28 Jan 2015 13:08:45 -0600
   4 Subject: [PATCH 232/365] lockdep: selftest: fix warnings due to missing
   5  PREEMPT_RT conditionals
   6
   7 "lockdep: Selftest: Only do hardirq context test for raw spinlock"
   8 disabled the execution of certain tests with PREEMPT_RT_FULL, but did
   9 not prevent the tests from still being defined.  This leads to warnings
  10 like:
  11
  12   ./linux/lib/locking-selftest.c:574:1: warning: 'irqsafe1_hard_rlock_12' defined but not used [-Wunused-function]
  13   ./linux/lib/locking-selftest.c:574:1: warning: 'irqsafe1_hard_rlock_21' defined but not used [-Wunused-function]
  14   ./linux/lib/locking-selftest.c:577:1: warning: 'irqsafe1_hard_wlock_12' defined but not used [-Wunused-function]
  15   ./linux/lib/locking-selftest.c:577:1: warning: 'irqsafe1_hard_wlock_21' defined but not used [-Wunused-function]
  16   ./linux/lib/locking-selftest.c:580:1: warning: 'irqsafe1_soft_spin_12' defined but not used [-Wunused-function]
  17   ...
  18
  19 Fixed by wrapping the test definitions in #ifndef CONFIG_PREEMPT_RT_FULL
  20 conditionals.
  21
  22
  23 Signed-off-by: Josh Cartwright <josh.cartwright@ni.com>
  24 Signed-off-by: Xander Huff <xander.huff@ni.com>
  25 Acked-by: Gratian Crisan <gratian.crisan@ni.com>
  26 Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  27 ---
  28  lib/locking-selftest.c | 27 +++++++++++++++++++++++++++
  29  1 file changed, 27 insertions(+)
  30
  31 diff --git a/lib/locking-selftest.c b/lib/locking-selftest.c
  32 index 19ae236..b93a610 100644
  33 --- a/lib/locking-selftest.c
  34 +++ b/lib/locking-selftest.c
  35 @@ -590,6 +590,8 @@ GENERATE_TESTCASE(init_held_rsem)
  36  #include "locking-selftest-spin-hardirq.h"
  37  GENERATE_PERMUTATIONS_2_EVENTS(irqsafe1_hard_spin)
  38
  39 +#ifndef CONFIG_PREEMPT_RT_FULL
  40 +
  41  #include "locking-selftest-rlock-hardirq.h"
  42  GENERATE_PERMUTATIONS_2_EVENTS(irqsafe1_hard_rlock)
  43
  44 @@ -605,9 +607,12 @@ GENERATE_PERMUTATIONS_2_EVENTS(irqsafe1_soft_rlock)
  45  #include "locking-selftest-wlock-softirq.h"
  46  GENERATE_PERMUTATIONS_2_EVENTS(irqsafe1_soft_wlock)
  47
  48 +#endif
  49 +
  50  #undef E1
  51  #undef E2
  52
  53 +#ifndef CONFIG_PREEMPT_RT_FULL
  54  /*
  55   * Enabling hardirqs with a softirq-safe lock held:
  56   */
  57 @@ -640,6 +645,8 @@ GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2A_rlock)
  58  #undef E1
  59  #undef E2
  60
  61 +#endif
  62 +
  63  /*
  64   * Enabling irqs with an irq-safe lock held:
  65   */
  66 @@ -663,6 +670,8 @@ GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2A_rlock)
  67  #include "locking-selftest-spin-hardirq.h"
  68  GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2B_hard_spin)
  69
  70 +#ifndef CONFIG_PREEMPT_RT_FULL
  71 +
  72  #include "locking-selftest-rlock-hardirq.h"
  73  GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2B_hard_rlock)
  74
  75 @@ -678,6 +687,8 @@ GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2B_soft_rlock)
  76  #include "locking-selftest-wlock-softirq.h"
  77  GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2B_soft_wlock)
  78
  79 +#endif
  80 +
  81  #undef E1
  82  #undef E2
  83
  84 @@ -709,6 +720,8 @@ GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2B_soft_wlock)
  85  #include "locking-selftest-spin-hardirq.h"
  86  GENERATE_PERMUTATIONS_3_EVENTS(irqsafe3_hard_spin)
  87
  88 +#ifndef CONFIG_PREEMPT_RT_FULL
  89 +
  90  #include "locking-selftest-rlock-hardirq.h"
  91  GENERATE_PERMUTATIONS_3_EVENTS(irqsafe3_hard_rlock)
  92
  93 @@ -724,6 +737,8 @@ GENERATE_PERMUTATIONS_3_EVENTS(irqsafe3_soft_rlock)
  94  #include "locking-selftest-wlock-softirq.h"
  95  GENERATE_PERMUTATIONS_3_EVENTS(irqsafe3_soft_wlock)
  96
  97 +#endif
  98 +
  99  #undef E1
 100  #undef E2
 101  #undef E3
 102 @@ -757,6 +772,8 @@ GENERATE_PERMUTATIONS_3_EVENTS(irqsafe3_soft_wlock)
 103  #include "locking-selftest-spin-hardirq.h"
 104  GENERATE_PERMUTATIONS_3_EVENTS(irqsafe4_hard_spin)
 105
 106 +#ifndef CONFIG_PREEMPT_RT_FULL
 107 +
 108  #include "locking-selftest-rlock-hardirq.h"
 109  GENERATE_PERMUTATIONS_3_EVENTS(irqsafe4_hard_rlock)
 110
 111 @@ -772,10 +789,14 @@ GENERATE_PERMUTATIONS_3_EVENTS(irqsafe4_soft_rlock)
 112  #include "locking-selftest-wlock-softirq.h"
 113  GENERATE_PERMUTATIONS_3_EVENTS(irqsafe4_soft_wlock)
 114
 115 +#endif
 116 +
 117  #undef E1
 118  #undef E2
 119  #undef E3
 120
 121 +#ifndef CONFIG_PREEMPT_RT_FULL
 122 +
 123  /*
 124   * read-lock / write-lock irq inversion.
 125   *
 126 @@ -838,6 +859,10 @@ GENERATE_PERMUTATIONS_3_EVENTS(irq_inversion_soft_wlock)
 127  #undef E2
 128  #undef E3
 129
 130 +#endif
 131 +
 132 +#ifndef CONFIG_PREEMPT_RT_FULL
 133 +
 134  /*
 135   * read-lock / write-lock recursion that is actually safe.
 136   */
 137 @@ -876,6 +901,8 @@ GENERATE_PERMUTATIONS_3_EVENTS(irq_read_recursion_soft)
 138  #undef E2
 139  #undef E3
 140
 141 +#endif
 142 +
 143  /*
 144   * read-lock / write-lock recursion that is unsafe.
 145   */
 146 --
 147 2.7.4
 148