Skip to content

Commit 127b0e0

Browse files
t-8chKAGA-KOKO
t-8ch
authored and
KAGA-KOKO
committed
vdso: Rename included Makefile
As the Makefile is included into other Makefiles it can not be used to define objects to be built from the current source directory. However the generic datastore will introduce such a local source file. Rename the included Makefile so it is clear how it is to be used and to make room for a regular Makefile in lib/vdso/. Signed-off-by: Thomas Weißschuh <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Link: https://lore.kernel.org/all/[email protected]
1 parent 5b47aba commit 127b0e0

File tree

14 files changed

+13
-13
lines changed

14 files changed

+13
-13
lines changed

‎arch/arm/vdso/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22

33
# Include the generic Makefile to check the built vdso.
4-
include $(srctree)/lib/vdso/Makefile
4+
include $(srctree)/lib/vdso/Makefile.include
55

66
hostprogs := vdsomunge
77

‎arch/arm64/kernel/vdso/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88

99
# Include the generic Makefile to check the built vdso.
10-
include $(srctree)/lib/vdso/Makefile
10+
include $(srctree)/lib/vdso/Makefile.include
1111

1212
obj-vdso := vgettimeofday.o note.o sigreturn.o vgetrandom.o vgetrandom-chacha.o
1313

‎arch/arm64/kernel/vdso32/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Makefile for vdso32
44
#
55

6-
include $(srctree)/lib/vdso/Makefile
6+
include $(srctree)/lib/vdso/Makefile.include
77

88
# Same as cc-*option, but using CC_COMPAT instead of CC
99
ifeq ($(CONFIG_CC_IS_CLANG), y)

‎arch/csky/kernel/vdso/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0-only
22

33
# Include the generic Makefile to check the built vdso.
4-
include $(srctree)/lib/vdso/Makefile
4+
include $(srctree)/lib/vdso/Makefile.include
55

66
# Symbols present in the vdso
77
vdso-syms += rt_sigreturn

‎arch/loongarch/vdso/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Objects to go into the VDSO.
33

44
# Include the generic Makefile to check the built vdso.
5-
include $(srctree)/lib/vdso/Makefile
5+
include $(srctree)/lib/vdso/Makefile.include
66

77
obj-vdso-y := elf.o vgetcpu.o vgettimeofday.o vgetrandom.o \
88
vgetrandom-chacha.o sigreturn.o

‎arch/mips/vdso/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Objects to go into the VDSO.
33

44
# Include the generic Makefile to check the built vdso.
5-
include $(srctree)/lib/vdso/Makefile
5+
include $(srctree)/lib/vdso/Makefile.include
66

77
obj-vdso-y := elf.o vgettimeofday.o sigreturn.o
88

‎arch/parisc/kernel/vdso32/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Include the generic Makefile to check the built vdso.
2-
include $(srctree)/lib/vdso/Makefile
2+
include $(srctree)/lib/vdso/Makefile.include
33

44
KCOV_INSTRUMENT := n
55

‎arch/parisc/kernel/vdso64/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Include the generic Makefile to check the built vdso.
2-
include $(srctree)/lib/vdso/Makefile
2+
include $(srctree)/lib/vdso/Makefile.include
33

44
KCOV_INSTRUMENT := n
55

‎arch/powerpc/kernel/vdso/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# List of files in the vdso, has to be asm only for now
44

55
# Include the generic Makefile to check the built vdso.
6-
include $(srctree)/lib/vdso/Makefile
6+
include $(srctree)/lib/vdso/Makefile.include
77

88
obj-vdso32 = sigtramp32-32.o gettimeofday-32.o datapage-32.o cacheflush-32.o note-32.o getcpu-32.o
99
obj-vdso64 = sigtramp64-64.o gettimeofday-64.o datapage-64.o cacheflush-64.o note-64.o getcpu-64.o

‎arch/riscv/kernel/vdso/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Copied from arch/tile/kernel/vdso/Makefile
33

44
# Include the generic Makefile to check the built vdso.
5-
include $(srctree)/lib/vdso/Makefile
5+
include $(srctree)/lib/vdso/Makefile.include
66
# Symbols present in the vdso
77
vdso-syms = rt_sigreturn
88
ifdef CONFIG_64BIT

‎arch/s390/kernel/vdso32/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# List of files in the vdso
33

44
# Include the generic Makefile to check the built vdso.
5-
include $(srctree)/lib/vdso/Makefile
5+
include $(srctree)/lib/vdso/Makefile.include
66
obj-vdso32 = vdso_user_wrapper-32.o note-32.o
77

88
# Build rules

‎arch/s390/kernel/vdso64/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# List of files in the vdso
33

44
# Include the generic Makefile to check the built vdso.
5-
include $(srctree)/lib/vdso/Makefile
5+
include $(srctree)/lib/vdso/Makefile.include
66
obj-vdso64 = vdso_user_wrapper.o note.o vgetrandom-chacha.o
77
obj-cvdso64 = vdso64_generic.o getcpu.o vgetrandom.o
88
VDSO_CFLAGS_REMOVE := -pg $(CC_FLAGS_FTRACE) $(CC_FLAGS_EXPOLINE)

‎arch/x86/entry/vdso/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55

66
# Include the generic Makefile to check the built vDSO:
7-
include $(srctree)/lib/vdso/Makefile
7+
include $(srctree)/lib/vdso/Makefile.include
88

99
# Files to link into the vDSO:
1010
vobjs-y := vdso-note.o vclock_gettime.o vgetcpu.o vgetrandom.o vgetrandom-chacha.o

‎lib/vdso/Makefile renamed to ‎lib/vdso/Makefile.include

File renamed without changes.

0 commit comments

Comments
 (0)