diff options
| author | David S. Miller <davem@davemloft.net> | 2016-06-30 11:03:36 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-30 11:03:36 +0200 |
| commit | ee58b57100ca953da7320c285315a95db2f7053d (patch) | |
| tree | 77b815a31240adc4d6326346908137fc6c2c3a96 /tools/virtio/ringtest/Makefile | |
| parent | Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirshe... (diff) | |
| parent | Merge tag 'nfs-for-4.7-2' of git://git.linux-nfs.org/projects/anna/linux-nfs (diff) | |
| download | linux-ee58b57100ca953da7320c285315a95db2f7053d.tar.xz linux-ee58b57100ca953da7320c285315a95db2f7053d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Several cases of overlapping changes, except the packet scheduler
conflicts which deal with the addition of the free list parameter
to qdisc_enqueue().
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/virtio/ringtest/Makefile')
| -rw-r--r-- | tools/virtio/ringtest/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/virtio/ringtest/Makefile b/tools/virtio/ringtest/Makefile index 50e086c6a7b6..877a8a4721b6 100644 --- a/tools/virtio/ringtest/Makefile +++ b/tools/virtio/ringtest/Makefile @@ -1,6 +1,6 @@ all: -all: ring virtio_ring_0_9 virtio_ring_poll virtio_ring_inorder ptr_ring +all: ring virtio_ring_0_9 virtio_ring_poll virtio_ring_inorder ptr_ring noring CFLAGS += -Wall CFLAGS += -pthread -O2 -ggdb @@ -17,6 +17,7 @@ virtio_ring_0_9: virtio_ring_0_9.o main.o virtio_ring_poll: virtio_ring_poll.o main.o virtio_ring_inorder: virtio_ring_inorder.o main.o ptr_ring: ptr_ring.o main.o +noring: noring.o main.o clean: -rm main.o -rm ring.o ring @@ -24,5 +25,6 @@ clean: -rm virtio_ring_poll.o virtio_ring_poll -rm virtio_ring_inorder.o virtio_ring_inorder -rm ptr_ring.o ptr_ring + -rm noring.o noring .PHONY: all clean |