Skip to main content

Browse the archive

Revision 835d1c3a98799914db8aee0973018af21128cd1e authored by Marc Zyngier on 30 July 2020, 09:53:05 UTC, committed by Will Deacon on 30 July 2020, 15:55:32 UTC 
arm64: Drop unnecessary include from asm/smp.h
 
asm/pointer_auth.h is not needed anymore in asm/smp.h, as 62a679cb2825
("arm64: simplify ptrauth initialization") removed the keys from the
secondary_data structure.

This also cures a compilation issue introduced by f227e3ec3b5c
("random32: update the net random state on interrupt and activity").

Fixes: 62a679cb2825 ("arm64: simplify ptrauth initialization")
Fixes: f227e3ec3b5c ("random32: update the net random state on interrupt and activity")
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Signed-off-by: Will Deacon <will@kernel.org>
1 parent 966a0ac
Raw File
Makefile.userprogs 
# SPDX-License-Identifier: GPL-2.0-only
#
# Build userspace programs for the target system
#

# Executables compiled from a single .c file
user-csingle	:= $(foreach m, $(userprogs), $(if $($(m)-objs),,$(m)))

# Executables linked based on several .o files
user-cmulti	:= $(foreach m, $(userprogs), $(if $($(m)-objs),$(m)))

# Objects compiled from .c files
user-cobjs	:= $(sort $(foreach m, $(userprogs), $($(m)-objs)))

user-csingle	:= $(addprefix $(obj)/, $(user-csingle))
user-cmulti	:= $(addprefix $(obj)/, $(user-cmulti))
user-cobjs	:= $(addprefix $(obj)/, $(user-cobjs))

user_ccflags	= -Wp,-MMD,$(depfile) $(KBUILD_USERCFLAGS) $(userccflags) \
			$($(target-stem)-userccflags)
user_ldflags	= $(KBUILD_USERLDFLAGS) $(userldflags) $($(target-stem)-userldflags)

# Create an executable from a single .c file
quiet_cmd_user_cc_c = CC [U]  $@
      cmd_user_cc_c = $(CC) $(user_ccflags) $(user_ldflags) -o $@ $< \
		      $($(target-stem)-userldlibs)
$(user-csingle): $(obj)/%: $(src)/%.c FORCE
	$(call if_changed_dep,user_cc_c)

# Link an executable based on list of .o files
quiet_cmd_user_ld = LD [U]  $@
      cmd_user_ld = $(CC) $(user_ldflags) -o $@ \
		    $(addprefix $(obj)/, $($(target-stem)-objs)) \
		    $($(target-stem)-userldlibs)
$(user-cmulti): FORCE
	$(call if_changed,user_ld)
$(call multi_depend, $(user-cmulti), , -objs)

# Create .o file from a .c file
quiet_cmd_user_cc_o_c = CC [U]  $@
      cmd_user_cc_o_c = $(CC) $(user_ccflags) -c -o $@ $<
$(user-cobjs): $(obj)/%.o: $(src)/%.c FORCE
	$(call if_changed_dep,user_cc_o_c)

targets += $(user-csingle) $(user-cmulti) $(user-cobjs)
back to top