diff options
| author | David S. Miller <davem@davemloft.net> | 2019-08-06 18:44:57 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-08-06 18:44:57 -0700 |
| commit | 13dfb3fa494361ea9a5950f27c9cd8b06d28c04f (patch) | |
| tree | 1bf30874f57c6c6b21160a10282191fcd0868055 /drivers/vhost | |
| parent | 05bb520376af2c5146d3c44832c22ec3bb54d778 (diff) | |
| parent | 33920f1ec5bf47c5c0a1d2113989bdd9dfb3fae9 (diff) | |
| download | blackbird-op-linux-13dfb3fa494361ea9a5950f27c9cd8b06d28c04f.tar.gz blackbird-op-linux-13dfb3fa494361ea9a5950f27c9cd8b06d28c04f.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Just minor overlapping changes in the conflicts here.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/vhost')
| -rw-r--r-- | drivers/vhost/vhost.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h index 819296332913..42a8c2a13ab1 100644 --- a/drivers/vhost/vhost.h +++ b/drivers/vhost/vhost.h @@ -96,7 +96,7 @@ struct vhost_uaddr { }; #if defined(CONFIG_MMU_NOTIFIER) && ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE == 0 -#define VHOST_ARCH_CAN_ACCEL_UACCESS 1 +#define VHOST_ARCH_CAN_ACCEL_UACCESS 0 #else #define VHOST_ARCH_CAN_ACCEL_UACCESS 0 #endif |
