diff options
author | Ingo Molnar <mingo@kernel.org> | 2020-01-10 18:53:14 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2020-01-10 18:53:14 +0100 |
commit | 57ad87ddce79b6d54f8e442d0ecf4b5bbe8c5a9e (patch) | |
tree | eaa43171e82737e8b33239e2e9bc3b4de67b7ddd /drivers/infiniband/hw/mlx5/main.c | |
parent | Merge branch 'linus' into efi/core, to pick up fixes (diff) | |
parent | mm, x86/mm: Untangle address space layout definitions from basic pgtable type definitions (diff) | |
download | linux-dev-57ad87ddce79b6d54f8e442d0ecf4b5bbe8c5a9e.tar.xz linux-dev-57ad87ddce79b6d54f8e442d0ecf4b5bbe8c5a9e.zip |
Merge branch 'x86/mm' into efi/core, to pick up dependencies
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/infiniband/hw/mlx5/main.c')
-rw-r--r-- | drivers/infiniband/hw/mlx5/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c index 997cbfe4b90c..df88bfbd7fed 100644 --- a/drivers/infiniband/hw/mlx5/main.c +++ b/drivers/infiniband/hw/mlx5/main.c @@ -40,7 +40,7 @@ #include <linux/slab.h> #include <linux/bitmap.h> #if defined(CONFIG_X86) -#include <asm/pat.h> +#include <asm/memtype.h> #endif #include <linux/sched.h> #include <linux/sched/mm.h> |