diff options
author | J. Bruce Fields <bfields@redhat.com> | 2017-06-28 19:34:15 +0200 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2017-06-28 19:34:15 +0200 |
commit | 9a1d168e1bc2893120bb7c0d9932dd22f97d0b55 (patch) | |
tree | f7d419f1601419aa0aebda102a6b14bdf7653443 /samples/bpf/sampleip_user.c | |
parent | nfsd4: const-ify nfsd4_ops (diff) | |
parent | Linux 4.12-rc5 (diff) | |
download | linux-9a1d168e1bc2893120bb7c0d9932dd22f97d0b55.tar.xz linux-9a1d168e1bc2893120bb7c0d9932dd22f97d0b55.zip |
Merge tag 'v4.12-rc5' into nfsd tree
Update to get f0c3192ceee3 "virtio_net: lower limit on buffer size".
That bug was interfering with my nfsd testing.
Diffstat (limited to 'samples/bpf/sampleip_user.c')
-rw-r--r-- | samples/bpf/sampleip_user.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/samples/bpf/sampleip_user.c b/samples/bpf/sampleip_user.c index be59d7dcbdde..4ed690b907ff 100644 --- a/samples/bpf/sampleip_user.c +++ b/samples/bpf/sampleip_user.c @@ -180,6 +180,7 @@ int main(int argc, char **argv) return 1; } signal(SIGINT, int_exit); + signal(SIGTERM, int_exit); /* do sampling */ printf("Sampling at %d Hertz for %d seconds. Ctrl-C also ends.\n", |