diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2015-05-18 11:31:50 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-18 19:08:29 +0200 |
| commit | ab992dc38f9ae40b3ab996d68449692d464c98cf (patch) | |
| tree | 04e22f06ab841142cb90d7394834ff6add928455 /lib/locking-selftest.c | |
| parent | Merge tag 'for-linus-20150516' of git://git.infradead.org/linux-mtd (diff) | |
| download | linux-ab992dc38f9ae40b3ab996d68449692d464c98cf.tar.xz linux-ab992dc38f9ae40b3ab996d68449692d464c98cf.zip | |
watchdog: Fix merge 'conflict'
Two watchdog changes that came through different trees had a non
conflicting conflict, that is, one changed the semantics of a variable
but no actual code conflict happened. So the merge appeared fine, but
the resulting code did not behave as expected.
Commit 195daf665a62 ("watchdog: enable the new user interface of the
watchdog mechanism") changes the semantics of watchdog_user_enabled,
which thereafter is only used by the functions introduced by
b3738d293233 ("watchdog: Add watchdog enable/disable all functions").
There further appears to be a distinct lack of serialization between
setting and using watchdog_enabled, so perhaps we should wrap the
{en,dis}able_all() things in watchdog_proc_mutex.
This patch fixes a s2r failure reported by Michal; which I cannot
readily explain. But this does make the code internally consistent
again.
Reported-and-tested-by: Michal Hocko <mhocko@suse.cz>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions