Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a45e9038 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'liblockdep-fixes-3.15' of... 

Merge branch 'liblockdep-fixes-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/sashal/linux

 into perf/urgent

Pull liblockdep fixes from Sasha Levin, to fix two build related bugs.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents a4b4f11b ad3b564d

tools/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -44,6 +44,9 @@ cpupower: FORCE 
cgroup firewire hv guest usb virtio vm net: FORCE

	$(call descend,$@)



liblockdep: FORCE

	$(call descend,lib/lockdep)



libapikfs: FORCE

	$(call descend,lib/api)
@@ -91,6 +94,9 @@ cpupower_clean: 
cgroup_clean hv_clean firewire_clean lguest_clean usb_clean virtio_clean vm_clean net_clean:

	$(call descend,$(@:_clean=),clean)



liblockdep_clean:

	$(call descend,lib/lockdep,clean)



libapikfs_clean:

	$(call descend,lib/api,clean)

tools/lib/lockdep/Makefile

+2 −3
Original line number Diff line number Diff line 
# file format version

FILE_VERSION = 1



MAKEFLAGS += --no-print-directory

LIBLOCKDEP_VERSION=$(shell make -sC ../../.. kernelversion)

LIBLOCKDEP_VERSION=$(shell make --no-print-directory -sC ../../.. kernelversion)



# Makefiles suck: This macro sets a default value of $(2) for the

# variable named by $(1), unless the variable has been set by
@@ -231,7 +230,7 @@ install_lib: all_cmd 
install: install_lib



clean:

	$(RM) *.o *~ $(TARGETS) *.a *.so $(VERSION_FILES) .*.d

	$(RM) *.o *~ $(TARGETS) *.a *liblockdep*.so* $(VERSION_FILES) .*.d

	$(RM) tags TAGS



endif # skip-makefile