diff options
| author | David S. Miller <davem@davemloft.net> | 2019-09-02 14:20:17 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-09-02 14:20:17 -0400 |
| commit | 765b7590c92d849806e9a27ab3a5a17cfc6a47a9 (patch) | |
| tree | 4387f5034f870accfd2bb56997c535159da45f06 /net/psample/psample.c | |
| parent | 4bc61b0b16955322576265724ab0a0075a30dc84 (diff) | |
| parent | 089cf7f6ecb266b6a4164919a2e69bd2f938374a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
r8152 conflicts are the NAPI fixes in 'net' overlapping with
some tasklet stuff in net-next
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/psample/psample.c')
| -rw-r--r-- | net/psample/psample.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/psample/psample.c b/net/psample/psample.c index 841f198ea1a8..66e4b61a350d 100644 --- a/net/psample/psample.c +++ b/net/psample/psample.c | |||
| @@ -154,7 +154,7 @@ static void psample_group_destroy(struct psample_group *group) | |||
| 154 | { | 154 | { |
| 155 | psample_group_notify(group, PSAMPLE_CMD_DEL_GROUP); | 155 | psample_group_notify(group, PSAMPLE_CMD_DEL_GROUP); |
| 156 | list_del(&group->list); | 156 | list_del(&group->list); |
| 157 | kfree(group); | 157 | kfree_rcu(group, rcu); |
| 158 | } | 158 | } |
| 159 | 159 | ||
| 160 | static struct psample_group * | 160 | static struct psample_group * |