The following commit has been merged into the core/mm branch of tip: Commit-ID: e8f147dc3f1f6b4c27b2eeaf82df4f469d80d469 Gitweb: https://git.kernel.org/tip/e8f147dc3f1f6b4c27b2eeaf82df4f469d80d469 Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx> AuthorDate: Tue, 03 Nov 2020 10:27:15 +01:00 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitterDate: Fri, 06 Nov 2020 23:14:53 +01:00 fs: Remove asm/kmap_types.h includes Historical leftovers from the time where kmap() had fixed slots. Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Acked-by: David Sterba <dsterba@xxxxxxxx> Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Link: https://lore.kernel.org/r/20201103095856.870272797@xxxxxxxxxxxxx --- fs/aio.c | 1 - fs/btrfs/ctree.h | 1 - 2 files changed, 2 deletions(-) diff --git a/fs/aio.c b/fs/aio.c index c45c20d..0247daf 100644 --- a/fs/aio.c +++ b/fs/aio.c @@ -43,7 +43,6 @@ #include <linux/mount.h> #include <linux/pseudo_fs.h> -#include <asm/kmap_types.h> #include <linux/uaccess.h> #include <linux/nospec.h> diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 0378933..01947f6 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -17,7 +17,6 @@ #include <linux/wait.h> #include <linux/slab.h> #include <trace/events/btrfs.h> -#include <asm/kmap_types.h> #include <asm/unaligned.h> #include <linux/pagemap.h> #include <linux/btrfs.h>
|