iommu/vt-d: Check capability before disabling protected memory

[thirdparty/kernel/stable.git] / Makefile

diff --git a/Makefile b/Makefile
index 70cc37cb3e99d0d51174463eed2d76b4cb9686c6..94673d2a6a27bf28b090729cc157d4b66b959687 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 4
 PATCHLEVEL = 14
-SUBLEVEL = 95
+SUBLEVEL = 112
 EXTRAVERSION =
 NAME = Petit Gorille
 
@@ -480,7 +480,7 @@ endif
 ifeq ($(cc-name),clang)
 ifneq ($(CROSS_COMPILE),)
 CLANG_FLAGS    := --target=$(notdir $(CROSS_COMPILE:%-=%))
-GCC_TOOLCHAIN_DIR := $(dir $(shell which $(LD)))
+GCC_TOOLCHAIN_DIR := $(dir $(shell which $(CROSS_COMPILE)elfedit))
 CLANG_FLAGS    += --prefix=$(GCC_TOOLCHAIN_DIR)
 GCC_TOOLCHAIN  := $(realpath $(GCC_TOOLCHAIN_DIR)/..)
 endif