summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2021-09-23 14:10:50 -0300
committerPeter Zijlstra <peterz@infradead.org>2021-10-07 13:51:07 +0200
commit77e52ae35463521041906c510fe580d15663bb93 (patch)
tree8f1a0d47222e4e1c60749ca0eebebe1fcb11ce84
parentc78416d122243c92992a1d1063f17ddd0bc80e6c (diff)
downloadlwn-77e52ae35463521041906c510fe580d15663bb93.tar.gz
lwn-77e52ae35463521041906c510fe580d15663bb93.zip
futex: Move to kernel/futex/
In preparation for splitup.. Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Suggested-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: André Almeida <andrealmeid@collabora.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Reviewed-by: André Almeida <andrealmeid@collabora.com> Link: https://lore.kernel.org/r/20210923171111.300673-2-andrealmeid@collabora.com
-rw-r--r--MAINTAINERS2
-rw-r--r--kernel/Makefile2
-rw-r--r--kernel/futex/Makefile3
-rw-r--r--kernel/futex/core.c (renamed from kernel/futex.c)2
4 files changed, 6 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index eeb4c70b3d5b..b3094cb1afdd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7725,7 +7725,7 @@ F: Documentation/locking/*futex*
F: include/asm-generic/futex.h
F: include/linux/futex.h
F: include/uapi/linux/futex.h
-F: kernel/futex.c
+F: kernel/futex/*
F: tools/perf/bench/futex*
F: tools/testing/selftests/futex/
diff --git a/kernel/Makefile b/kernel/Makefile
index 4df609be42d0..3f6ab5d5041b 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -59,7 +59,7 @@ obj-$(CONFIG_FREEZER) += freezer.o
obj-$(CONFIG_PROFILING) += profile.o
obj-$(CONFIG_STACKTRACE) += stacktrace.o
obj-y += time/
-obj-$(CONFIG_FUTEX) += futex.o
+obj-$(CONFIG_FUTEX) += futex/
obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o
obj-$(CONFIG_SMP) += smp.o
ifneq ($(CONFIG_SMP),y)
diff --git a/kernel/futex/Makefile b/kernel/futex/Makefile
new file mode 100644
index 000000000000..b89ba3fba343
--- /dev/null
+++ b/kernel/futex/Makefile
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-y += core.o
diff --git a/kernel/futex.c b/kernel/futex/core.c
index c15ad276fd15..f9bc9aa0ce1e 100644
--- a/kernel/futex.c
+++ b/kernel/futex/core.c
@@ -42,7 +42,7 @@
#include <asm/futex.h>
-#include "locking/rtmutex_common.h"
+#include "../locking/rtmutex_common.h"
/*
* READ this before attempting to hack on futexes!