The following commit has been merged into the locking/core branch of tip: Commit-ID: 9a71df495c3d29dab596bb590e73fd8b20106e2d Gitweb: https://git.kernel.org/tip/9a71df495c3d29dab596bb590e73fd8b20106e2d Author: André Almeida <andrealmeid@xxxxxxxxxxxxx> AuthorDate: Thu, 02 Jul 2020 17:28:42 -03:00 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitterDate: Sat, 18 Jul 2020 01:56:09 +02:00 futex: Remove unused or redundant includes Since 82af7aca ("Removal of FUTEX_FD"), some includes related to file operations aren't needed anymore. More investigation around the includes showed that a lot of includes aren't required for compilation, possible due to redundant includes. Simplify the code by removing unused includes. Signed-off-by: André Almeida <andrealmeid@xxxxxxxxxxxxx> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Link: https://lkml.kernel.org/r/20200702202843.520764-4-andrealmeid@xxxxxxxxxxxxx --- kernel/futex.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/kernel/futex.c b/kernel/futex.c index cda9175..4616d4a 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -32,30 +32,13 @@ * "But they come in a choice of three flavours!" */ #include <linux/compat.h> -#include <linux/slab.h> -#include <linux/poll.h> -#include <linux/fs.h> -#include <linux/file.h> #include <linux/jhash.h> -#include <linux/init.h> -#include <linux/futex.h> -#include <linux/mount.h> #include <linux/pagemap.h> #include <linux/syscalls.h> -#include <linux/signal.h> -#include <linux/export.h> -#include <linux/magic.h> -#include <linux/pid.h> -#include <linux/nsproxy.h> -#include <linux/ptrace.h> -#include <linux/sched/rt.h> -#include <linux/sched/wake_q.h> -#include <linux/sched/mm.h> #include <linux/hugetlb.h> #include <linux/freezer.h> #include <linux/memblock.h> #include <linux/fault-inject.h> -#include <linux/refcount.h> #include <asm/futex.h>