]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 14 Aug 2014 16:09:48 +0000 (10:09 -0600)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 14 Aug 2014 16:09:48 +0000 (10:09 -0600)
commitf7bc166c8741376b573b9c3ad6c3c629303b6f5a
tree1daf6dea42eee46481feef90a66242df9e768f38
parent4d7963de862f353f92cb2a26e3d54064a32577d6
parentc9b41b1f292a01c0e76b09735c9979b48bfdb200
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Pull seccomp fix from James Morris.

BUG(!spin_is_locked()) really doesn't work very well in UP
configurations without any actual spinlock state.  Which is very much
why we have that "assert_spin_lock()" function for this.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  seccomp: Replace BUG(!spin_is_locked()) with assert_spin_lock