Commit-ID: 1a09a4956352eff1e1e763a2bc0ab825067bb319
Gitweb: http://git.kernel.org/tip/1a09a4956352eff1e1e763a2bc0ab825067bb319
Author: David Rientjes <rientjes@xxxxxxxxxx>
AuthorDate: Thu, 6 Feb 2014 13:13:08 -0800
Committer: Pekka Enberg <penberg@xxxxxxxxxx>
CommitDate: Sun, 16 Feb 2014 21:56:48 +0200
x86, kvmtool: Fix build when KVM_TOOL_TEST_ENABLE is set
Commit ab7db91705e9 ("virtio-net: auto-tune mergeable rx buffer size for
improved performance") requires CONFIG_AVERAGE to be set, which is
selected by CONFIG_VIRTIO_NET, otherwise the build fails:
drivers/built-in.o: In function `virtnet_poll':
virtio_net.c:(.text+0x11d51f): undefined reference to `ewma_add'
drivers/built-in.o: In function `virtnet_probe':
virtio_net.c:(.text+0x11e668): undefined reference to `ewma_init'
CONFIG_KVM_TOOL_TEST_ENABLE selects CONFIG_VIRTIO_NET but not
CONFIG_AVERAGE so the build breaks when enabling it.
Select CONFIG_AVERAGE for CONFIG_KVMTOOL_TEST_ENABLE.
Signed-off-by: David Rientjes <rientjes@xxxxxxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
---
arch/x86/Kconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 6070398..c0aa3e7 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -627,6 +627,7 @@ config KVMTOOL_TEST_ENABLE
select VIRTIO_BLK
select VIRTIO_CONSOLE
select VIRTIO_NET
+ select AVERAGE
select 9P_FS
select NET_9P
select NET_9P_VIRTIO
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|