Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 017f2b239dabb2740b91df162e004371b861f371

Authored by Lai Jiangshan
Committed by Steven Rostedt
1 parent 2e12978a9f
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

futex,plist: Remove debug lock assignment from plist_node 

The original code uses &plist_node->plist as the fake head of
the priority list for plist_del(), these debug locks in
the fake head are needed for CONFIG_DEBUG_PI_LIST.

But now we always pass the real head to plist_del(), the debug locks
in plist_node will not be used, so we remove these assignments.

Acked-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by:  Lai Jiangshan <laijs@cn.fujitsu.com>
LKML-Reference: <4D10797E.7040803@cn.fujitsu.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

Showing 1 changed file with 0 additions and 9 deletions Side-by-side Diff

... ... @@ -1089,9 +1089,6 @@
1089 1089 plist_del(&q->list, &hb1->chain);
1090 1090 plist_add(&q->list, &hb2->chain);
1091 1091 q->lock_ptr = &hb2->lock;
1092   -#ifdef CONFIG_DEBUG_PI_LIST
1093   - q->list.plist.spinlock = &hb2->lock;
1094   -#endif
1095 1092 }
1096 1093 get_futex_key_refs(key2);
1097 1094 q->key = *key2;
... ... @@ -1124,9 +1121,6 @@
1124 1121 q->rt_waiter = NULL;
1125 1122  
1126 1123 q->lock_ptr = &hb->lock;
1127   -#ifdef CONFIG_DEBUG_PI_LIST
1128   - q->list.plist.spinlock = &hb->lock;
1129   -#endif
1130 1124  
1131 1125 wake_up_state(q->task, TASK_NORMAL);
1132 1126 }
... ... @@ -1474,9 +1468,6 @@
1474 1468 prio = min(current->normal_prio, MAX_RT_PRIO);
1475 1469  
1476 1470 plist_node_init(&q->list, prio);
1477   -#ifdef CONFIG_DEBUG_PI_LIST
1478   - q->list.plist.spinlock = &hb->lock;
1479   -#endif
1480 1471 plist_add(&q->list, &hb->chain);
1481 1472 q->task = current;
1482 1473 spin_unlock(&hb->lock);