Merge branch 'bpf-smap-followups'
authorDavid S. Miller <davem@davemloft.net>
Thu, 17 Aug 2017 17:25:19 +0000 (10:25 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 17 Aug 2017 17:25:19 +0000 (10:25 -0700)
Daniel Borkmann says:

====================
Two BPF smap related followups

Fixing preemption imbalance and consolidating prologue
generation. Thanks!
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial merge