Skip to contentSkip to conversation

arch: syscalls: simplify uapi/kapi directory creation

PATCH In review Masahiro Yamada 2 participants 2 messages Feb 27, 2022 – Feb 28, 2022

Subsystems (15)
Arm (32-bit) x86 PowerPC Kbuild +11 more subsystems
lore
Share & tools
lore

Masahiro Yamada

author
#0 lore raw

PATCH 1/1 arch: syscalls: simplify uapi/kapi directory creation

$(shell ...) expands to empty. There is no need to assign it to _dummy.

Signed-off-by Masahiro Yamada <[email protected]>

---

 arch/alpha/kernel/syscalls/Makefile      | 3 +--
 arch/arm/tools/Makefile                  | 3 +--
 arch/ia64/kernel/syscalls/Makefile       | 3 +--
 arch/m68k/kernel/syscalls/Makefile       | 3 +--
 arch/microblaze/kernel/syscalls/Makefile | 3 +--
 arch/mips/kernel/syscalls/Makefile       | 3 +--
 arch/parisc/kernel/syscalls/Makefile     | 3 +--
 arch/powerpc/kernel/syscalls/Makefile    | 3 +--
 arch/s390/kernel/syscalls/Makefile       | 3 +--
 arch/sh/kernel/syscalls/Makefile         | 3 +--
 arch/sparc/kernel/syscalls/Makefile      | 3 +--
 arch/x86/entry/syscalls/Makefile         | 3 +--
 arch/xtensa/kernel/syscalls/Makefile     | 3 +--
 13 files changed, 13 insertions(+), 26 deletions(-)
arch/alpha/kernel/syscalls/Makefile +1 -2
index 6713c65a25e1..b265e4bc16c2 100644
@@ -2,8 +2,7 @@
 kapi := arch/$(SRCARCH)/include/generated/asm
 uapi := arch/$(SRCARCH)/include/generated/uapi/asm
 
-_dummy := $(shell [ -d '$(uapi)' ] || mkdir -p '$(uapi)')	\
-	  $(shell [ -d '$(kapi)' ] || mkdir -p '$(kapi)')
+$(shell mkdir -p $(uapi) $(kapi))
 
 syscall := $(src)/syscall.tbl
 syshdr := $(srctree)/scripts/syscallhdr.sh
arch/arm/tools/Makefile +1 -2
index 4a5c50f67ced..81f13bdf32f2 100644
@@ -29,8 +29,7 @@ kapi:	$(kapi-hdrs-y) $(gen-y)
 uapi:	$(uapi-hdrs-y)
 
 # Create output directory if not already present
-_dummy := $(shell [ -d '$(kapi)' ] || mkdir -p '$(kapi)') \
-          $(shell [ -d '$(uapi)' ] || mkdir -p '$(uapi)')
+$(shell mkdir -p $(kapi) $(uapi))
 
 quiet_cmd_gen_mach = GEN     $@
       cmd_gen_mach = $(AWK) -f $(real-prereqs) > $@
arch/ia64/kernel/syscalls/Makefile +1 -2
index 14f40ecf8b65..d009f927a048 100644
@@ -2,8 +2,7 @@
 kapi := arch/$(SRCARCH)/include/generated/asm
 uapi := arch/$(SRCARCH)/include/generated/uapi/asm
 
-_dummy := $(shell [ -d '$(uapi)' ] || mkdir -p '$(uapi)')	\
-	  $(shell [ -d '$(kapi)' ] || mkdir -p '$(kapi)')
+$(shell mkdir -p $(uapi) $(kapi))
 
 syscall := $(src)/syscall.tbl
 syshdr := $(srctree)/scripts/syscallhdr.sh
arch/m68k/kernel/syscalls/Makefile +1 -2
index 6713c65a25e1..b265e4bc16c2 100644
@@ -2,8 +2,7 @@
 kapi := arch/$(SRCARCH)/include/generated/asm
 uapi := arch/$(SRCARCH)/include/generated/uapi/asm
 
-_dummy := $(shell [ -d '$(uapi)' ] || mkdir -p '$(uapi)')	\
-	  $(shell [ -d '$(kapi)' ] || mkdir -p '$(kapi)')
+$(shell mkdir -p $(uapi) $(kapi))
 
 syscall := $(src)/syscall.tbl
 syshdr := $(srctree)/scripts/syscallhdr.sh
arch/microblaze/kernel/syscalls/Makefile +1 -2
index 6713c65a25e1..b265e4bc16c2 100644
@@ -2,8 +2,7 @@
 kapi := arch/$(SRCARCH)/include/generated/asm
 uapi := arch/$(SRCARCH)/include/generated/uapi/asm
 
-_dummy := $(shell [ -d '$(uapi)' ] || mkdir -p '$(uapi)')	\
-	  $(shell [ -d '$(kapi)' ] || mkdir -p '$(kapi)')
+$(shell mkdir -p $(uapi) $(kapi))
 
 syscall := $(src)/syscall.tbl
 syshdr := $(srctree)/scripts/syscallhdr.sh
arch/mips/kernel/syscalls/Makefile +1 -2
index 10bf90dc02c0..e6b21de65cca 100644
@@ -2,8 +2,7 @@
 kapi := arch/$(SRCARCH)/include/generated/asm
 uapi := arch/$(SRCARCH)/include/generated/uapi/asm
 
-_dummy := $(shell [ -d '$(uapi)' ] || mkdir -p '$(uapi)')	\
-	  $(shell [ -d '$(kapi)' ] || mkdir -p '$(kapi)')
+$(shell mkdir -p $(uapi) $(kapi))
 
 syshdr := $(srctree)/scripts/syscallhdr.sh
 sysnr := $(srctree)/$(src)/syscallnr.sh
arch/parisc/kernel/syscalls/Makefile +1 -2
index d63f18dd058d..8440c16dfb22 100644
@@ -2,8 +2,7 @@
 kapi := arch/$(SRCARCH)/include/generated/asm
 uapi := arch/$(SRCARCH)/include/generated/uapi/asm
 
-_dummy := $(shell [ -d '$(uapi)' ] || mkdir -p '$(uapi)')	\
-	  $(shell [ -d '$(kapi)' ] || mkdir -p '$(kapi)')
+$(shell mkdir -p $(uapi) $(kapi))
 
 syscall := $(src)/syscall.tbl
 syshdr := $(srctree)/scripts/syscallhdr.sh
arch/powerpc/kernel/syscalls/Makefile +1 -2
index 5476f62eb80f..9d7bd81510b8 100644
@@ -2,8 +2,7 @@
 kapi := arch/$(SRCARCH)/include/generated/asm
 uapi := arch/$(SRCARCH)/include/generated/uapi/asm
 
-_dummy := $(shell [ -d '$(uapi)' ] || mkdir -p '$(uapi)')	\
-	  $(shell [ -d '$(kapi)' ] || mkdir -p '$(kapi)')
+$(shell mkdir -p $(uapi) $(kapi))
 
 syscall := $(src)/syscall.tbl
 syshdr := $(srctree)/scripts/syscallhdr.sh
arch/s390/kernel/syscalls/Makefile +1 -2
index b98f25029b8e..fb85e797946d 100644
@@ -21,8 +21,7 @@ uapi:	$(uapi-hdrs-y)
 
 
 # Create output directory if not already present
-_dummy := $(shell [ -d '$(uapi)' ] || mkdir -p '$(uapi)') \
-	  $(shell [ -d '$(kapi)' ] || mkdir -p '$(kapi)')
+$(shell mkdir -p $(uapi) $(kapi))
 
 filechk_syshdr = $(CONFIG_SHELL) '$(systbl)' -H -a $(syshdr_abi_$(basetarget)) -f "$2" < $<
arch/sh/kernel/syscalls/Makefile +1 -2
index 6713c65a25e1..b265e4bc16c2 100644
@@ -2,8 +2,7 @@
 kapi := arch/$(SRCARCH)/include/generated/asm
 uapi := arch/$(SRCARCH)/include/generated/uapi/asm
 
-_dummy := $(shell [ -d '$(uapi)' ] || mkdir -p '$(uapi)')	\
-	  $(shell [ -d '$(kapi)' ] || mkdir -p '$(kapi)')
+$(shell mkdir -p $(uapi) $(kapi))
 
 syscall := $(src)/syscall.tbl
 syshdr := $(srctree)/scripts/syscallhdr.sh
arch/sparc/kernel/syscalls/Makefile +1 -2
index d63f18dd058d..8440c16dfb22 100644
@@ -2,8 +2,7 @@
 kapi := arch/$(SRCARCH)/include/generated/asm
 uapi := arch/$(SRCARCH)/include/generated/uapi/asm
 
-_dummy := $(shell [ -d '$(uapi)' ] || mkdir -p '$(uapi)')	\
-	  $(shell [ -d '$(kapi)' ] || mkdir -p '$(kapi)')
+$(shell mkdir -p $(uapi) $(kapi))
 
 syscall := $(src)/syscall.tbl
 syshdr := $(srctree)/scripts/syscallhdr.sh
arch/x86/entry/syscalls/Makefile +1 -2
index 5b3efed0e4e8..9104039cd8f2 100644
@@ -3,8 +3,7 @@ out := arch/$(SRCARCH)/include/generated/asm
 uapi := arch/$(SRCARCH)/include/generated/uapi/asm
 
 # Create output directory if not already present
-_dummy := $(shell [ -d '$(out)' ] || mkdir -p '$(out)') \
-	  $(shell [ -d '$(uapi)' ] || mkdir -p '$(uapi)')
+$(shell mkdir -p $(out) $(uapi))
 
 syscall32 := $(src)/syscall_32.tbl
 syscall64 := $(src)/syscall_64.tbl
arch/xtensa/kernel/syscalls/Makefile +1 -2
index 6713c65a25e1..b265e4bc16c2 100644
@@ -2,8 +2,7 @@
 kapi := arch/$(SRCARCH)/include/generated/asm
 uapi := arch/$(SRCARCH)/include/generated/uapi/asm
 
-_dummy := $(shell [ -d '$(uapi)' ] || mkdir -p '$(uapi)')	\
-	  $(shell [ -d '$(kapi)' ] || mkdir -p '$(kapi)')
+$(shell mkdir -p $(uapi) $(kapi))
 
 syscall := $(src)/syscall.tbl
 syshdr := $(srctree)/scripts/syscallhdr.sh
Signature · 1 line
2.32.0
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 5 lines · Masahiro Yamada

$(shell ...) expands to empty. There is no need to assign it to _dummy.

Signed-off-by Masahiro Yamada <[email protected]>
 arch/m68k/kernel/syscalls/Makefile       | 3 +--
Acked-by Geert Uytterhoeven <[email protected]>

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds