[PATCH v11 06/14] fixup seccomp

Hajime Tazaki posted 14 patches 2 weeks ago
There is a newer version of this series
[PATCH v11 06/14] fixup seccomp
Posted by Hajime Tazaki 2 weeks ago
---
 arch/um/nommu/os-Linux/Makefile        | 2 +-
 arch/um/{ => nommu}/os-Linux/seccomp.c | 0
 arch/um/os-Linux/Makefile              | 5 -----
 3 files changed, 1 insertion(+), 6 deletions(-)
 rename arch/um/{ => nommu}/os-Linux/seccomp.c (100%)

diff --git a/arch/um/nommu/os-Linux/Makefile b/arch/um/nommu/os-Linux/Makefile
index 68833c576437..805e26ccf63b 100644
--- a/arch/um/nommu/os-Linux/Makefile
+++ b/arch/um/nommu/os-Linux/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 
-obj-y := signal.o
+obj-y := seccomp.o signal.o
 USER_OBJS := $(obj-y)
 
 include $(srctree)/arch/um/scripts/Makefile.rules
diff --git a/arch/um/os-Linux/seccomp.c b/arch/um/nommu/os-Linux/seccomp.c
similarity index 100%
rename from arch/um/os-Linux/seccomp.c
rename to arch/um/nommu/os-Linux/seccomp.c
diff --git a/arch/um/os-Linux/Makefile b/arch/um/os-Linux/Makefile
index 432476a4239a..c048fc838068 100644
--- a/arch/um/os-Linux/Makefile
+++ b/arch/um/os-Linux/Makefile
@@ -21,9 +21,4 @@ USER_OBJS := $(user-objs-y) elf_aux.o execvp.o file.o helper.o irq.o \
 	main.o mem.o process.o registers.o sigio.o signal.o start_up.o time.o \
 	tty.o umid.o util.o
 
-ifneq ($(CONFIG_MMU),y)
-obj-y += seccomp.o
-USER_OBJS += seccomp.o
-endif
-
 include $(srctree)/arch/um/scripts/Makefile.rules
-- 
2.43.0