From: David S. Miller Date: Wed, 22 Jan 2014 02:41:46 +0000 (-0800) Subject: Merge branch 'sctp' X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=656edac6784181fccdab97cc8a59127ea6b08910;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge branch 'sctp' Wang Weidong says: ==================== sctp: remove some macro locking wrappers In sctp.h we can find some macro locking wrappers. As Neil point out that: "Its because in the origional implementation of the sctp protocol, there was a user space test harness which built the kernel module for userspace execution to cary our some unit testing on the code. It did so by redefining some of those locking macros to user space friendly code. IIRC we haven't use those unit tests in years, and so should be removing them, not adding them to other locations." So I remove them. ==================== Acked-by: Neil Horman Acked-by: Vlad Yasevich Signed-off-by: David S. Miller --- 656edac6784181fccdab97cc8a59127ea6b08910