From: Heiko Carstens Date: Wed, 7 Jan 2015 09:04:41 +0000 (+0100) Subject: softirq/preempt: Add missing current->preempt_disable_ip update X-Git-Tag: omap-for-v4.1/prcm-dts-mfd-syscon-fix~165^2~9 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f1ba9a2cea52896448ef4e14a4cb1880b8e5bee;p=pandora-kernel.git softirq/preempt: Add missing current->preempt_disable_ip update While debugging some "sleeping function called from invalid context" bug I realized that the debugging message "Preemption disabled at:" pointed to an incorrect function. In particular if the last function/action that disabled preemption was spin_lock_bh() then current->preempt_disable_ip won't be updated. The reason for this is that __local_bh_disable_ip() will increase preempt_count manually instead of calling preempt_count_add(), which would handle the update correctly. It look like the manual handling was done to work around some lockdep issue. So add the missing update of current->preempt_disable_ip to __local_bh_disable_ip() as well. Signed-off-by: Heiko Carstens Signed-off-by: Peter Zijlstra (Intel) Cc: Paul E. McKenney Cc: Andrew Morton Cc: Linus Torvalds Link: http://lkml.kernel.org/r/20150107090441.GC4365@osiris Signed-off-by: Ingo Molnar --- Reading git-diff-tree failed